Merge branch 'master' into debian astakos/debian/v0.7.3 astakos/v0.7.3
authorKostas Papadimitriou <kpap@grnet.gr>
Mon, 6 Aug 2012 12:46:12 +0000 (15:46 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Mon, 6 Aug 2012 12:46:12 +0000 (15:46 +0300)

Trivial merge