Merge branch 'master' into packaging
authorKostas Papadimitriou <kpap@grnet.gr>
Mon, 20 Feb 2012 11:23:43 +0000 (13:23 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Mon, 20 Feb 2012 11:23:43 +0000 (13:23 +0200)

Trivial merge