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

Trivial merge