Merge branch 'stable-0.1-hd' into stable-0.1
authorNikos Skalkotos <skalkoto@grnet.gr>
Mon, 17 Dec 2012 10:17:07 +0000 (12:17 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Mon, 17 Dec 2012 10:17:07 +0000 (12:17 +0200)

Trivial merge