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

Trivial merge