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

Trivial merge