Merge branch 'hotfix-0.4.3'
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 18 Jul 2013 07:40:26 +0000 (10:40 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 18 Jul 2013 07:40:26 +0000 (10:40 +0300)

Trivial merge