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

Trivial merge