Merge branch 'master' into debian
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 12 Jun 2012 14:40:41 +0000 (17:40 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 12 Jun 2012 14:40:41 +0000 (17:40 +0300)

Trivial merge