Merge branch 'release-0.3' into debian-release-0.3
authorFilippos Giannakos <philipgian@grnet.gr>
Wed, 5 Jun 2013 09:25:37 +0000 (12:25 +0300)
committerFilippos Giannakos <philipgian@grnet.gr>
Wed, 5 Jun 2013 09:25:37 +0000 (12:25 +0300)

Trivial merge