Merge branch 'newfeatures'
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 28 Mar 2012 09:00:42 +0000 (12:00 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 28 Mar 2012 09:00:42 +0000 (12:00 +0300)

Trivial merge