Merge branch 'master' into debian-0.9
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 3 May 2012 09:16:16 +0000 (12:16 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 3 May 2012 09:16:16 +0000 (12:16 +0300)

Trivial merge