Merge branch 'master' into debian v0.11.0
authorDimitris Aragriorgs <dimara@grnet.gr>
Fri, 7 Sep 2012 09:24:10 +0000 (12:24 +0300)
committerDimitris Aragriorgs <dimara@grnet.gr>
Fri, 7 Sep 2012 09:24:10 +0000 (12:24 +0300)

Trivial merge