Merge branch 'master' into debian
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 14 Feb 2013 14:52:55 +0000 (16:52 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 14 Feb 2013 14:52:55 +0000 (16:52 +0200)

Trivial merge