Merge branch 'master' into packaging v0.8.7
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 19 Apr 2012 09:17:52 +0000 (12:17 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 19 Apr 2012 09:17:52 +0000 (12:17 +0300)

Trivial merge