Merge branch 'develop' into release-0.7
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 13 Feb 2013 11:15:56 +0000 (13:15 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 13 Feb 2013 11:15:56 +0000 (13:15 +0200)

Trivial merge