Merge branch 'release-0.2' into debian-release-0.2
authorFilippos Giannakos <philipgian@grnet.gr>
Thu, 30 May 2013 09:29:02 +0000 (12:29 +0300)
committerFilippos Giannakos <philipgian@grnet.gr>
Thu, 30 May 2013 09:29:02 +0000 (12:29 +0300)

Trivial merge