Merge branch 'master' into debian
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 4 Apr 2012 11:48:57 +0000 (14:48 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 4 Apr 2012 11:48:57 +0000 (14:48 +0300)

Trivial merge