Merge branch 'hotfix-0.4.4' into debian-hotfix-0.4.4
authorNikos Skalkotos <skalkoto@grnet.gr>
Wed, 31 Jul 2013 12:44:14 +0000 (15:44 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Wed, 31 Jul 2013 12:44:14 +0000 (15:44 +0300)

Trivial merge