Merge branch 'hotfix-0.5.3'
authorNikos Skalkotos <skalkoto@grnet.gr>
Wed, 9 Oct 2013 15:06:59 +0000 (18:06 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Wed, 9 Oct 2013 15:06:59 +0000 (18:06 +0300)

Trivial merge