Merge branch 'develop' into release-0.7
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 19 Feb 2013 14:18:09 +0000 (16:18 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 19 Feb 2013 14:18:09 +0000 (16:18 +0200)

Trivial merge