Merge branch 'master' into debian-0.9
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 28 Feb 2012 14:25:12 +0000 (16:25 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 28 Feb 2012 14:25:12 +0000 (16:25 +0200)

Trivial merge