Merge branch 'master' of https://code.grnet.gr/git/pithos
authorroot <root@pithos.dev.grnet.gr>
Thu, 28 Jul 2011 14:54:30 +0000 (17:54 +0300)
committerroot <root@pithos.dev.grnet.gr>
Thu, 28 Jul 2011 14:54:30 +0000 (17:54 +0300)

Trivial merge