Merge branch 'master' into packaging
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 21 Feb 2012 13:08:45 +0000 (15:08 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 21 Feb 2012 13:08:45 +0000 (15:08 +0200)

Trivial merge