Merge branch 'master' into debian-0.9
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 18 Jul 2012 17:17:45 +0000 (20:17 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 18 Jul 2012 17:17:45 +0000 (20:17 +0300)

Trivial merge