Merge branch 'master' into debian-0.9
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 19 Jul 2012 11:47:32 +0000 (14:47 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 19 Jul 2012 11:47:32 +0000 (14:47 +0300)

Trivial merge