Merge branch 'master' into debian-0.9
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 11 Apr 2012 14:23:44 +0000 (17:23 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 11 Apr 2012 14:23:44 +0000 (17:23 +0300)

Trivial merge