Merge branch 'hotfix-0.6.1'
authorNikos Skalkotos <skalkoto@grnet.gr>
Fri, 10 Jan 2014 10:03:19 +0000 (12:03 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Fri, 10 Jan 2014 10:03:19 +0000 (12:03 +0200)

Trivial merge