Merge branch 'master' into debian debian/v0.1.1
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 28 Feb 2012 08:52:13 +0000 (10:52 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 28 Feb 2012 08:52:13 +0000 (10:52 +0200)

Trivial merge