Merge remote-tracking branch 'origin/master'
authorProdromos Gerakios <pgerakios@grnet.gr>
Mon, 9 Jul 2012 09:59:06 +0000 (12:59 +0300)
committerProdromos Gerakios <pgerakios@grnet.gr>
Mon, 9 Jul 2012 09:59:06 +0000 (12:59 +0300)

Trivial merge