Merge branch 'master' into debian
authorKostas Papadimitriou <kpap@grnet.gr>
Fri, 8 Feb 2013 12:21:57 +0000 (14:21 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Fri, 8 Feb 2013 12:21:57 +0000 (14:21 +0200)

Trivial merge