Merge branch 'master' into debian
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 2 Aug 2012 17:01:08 +0000 (17:01 +0000)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 2 Aug 2012 17:01:08 +0000 (17:01 +0000)

Trivial merge