Merge branch 'stable-0.1-hd'
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 10 Jan 2013 14:25:30 +0000 (16:25 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 10 Jan 2013 14:25:30 +0000 (16:25 +0200)

Trivial merge