Merge branch 'master' into debian
authorKostas Papadimitriou <kpap@grnet.gr>
Mon, 11 Jun 2012 10:39:04 +0000 (13:39 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Mon, 11 Jun 2012 10:39:04 +0000 (13:39 +0300)

Trivial merge