Merge branch 'develop'
authorFilippos Giannakos <philipgian@grnet.gr>
Wed, 30 Jan 2013 11:48:47 +0000 (13:48 +0200)
committerFilippos Giannakos <philipgian@grnet.gr>
Wed, 30 Jan 2013 11:48:47 +0000 (13:48 +0200)

Trivial merge