Merge branch 'master' into debian
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 14 Jun 2012 11:23:58 +0000 (14:23 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 14 Jun 2012 11:23:58 +0000 (14:23 +0300)

Trivial merge