Merge branch 'master' into packaging v0.9.2
authorKostas Papadimitriou <kpap@grnet.gr>
Fri, 22 Jun 2012 13:42:22 +0000 (16:42 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Fri, 22 Jun 2012 13:42:22 +0000 (16:42 +0300)

Trivial merge