Merge branch 'master' into debian
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 28 Mar 2012 09:37:43 +0000 (12:37 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 28 Mar 2012 09:37:43 +0000 (12:37 +0300)

Trivial merge