Merge branch 'master' into debian
authorKostas Papadimitriou <kpap@grnet.gr>
Fri, 8 Jun 2012 12:50:38 +0000 (15:50 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Fri, 8 Jun 2012 12:50:38 +0000 (15:50 +0300)

Trivial merge