Merge branch 'hotfix-0.5.1' into develop
authorNikos Skalkotos <skalkoto@grnet.gr>
Fri, 23 Aug 2013 14:17:58 +0000 (17:17 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Fri, 23 Aug 2013 14:17:58 +0000 (17:17 +0300)

Trivial merge