Merge branch 'release-0.7' into feature-cli-input
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 12 Feb 2013 13:42:28 +0000 (15:42 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 12 Feb 2013 13:42:28 +0000 (15:42 +0200)

Trivial merge