Merge branch 'develop' into release-0.7
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 20 Feb 2013 17:00:19 +0000 (19:00 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 20 Feb 2013 17:00:19 +0000 (19:00 +0200)

Trivial merge