Merge branch 'master' of https://code.grnet.gr/git/pithos
authorroot <root@pithos.dev.grnet.gr>
Tue, 7 Feb 2012 15:07:17 +0000 (17:07 +0200)
committerroot <root@pithos.dev.grnet.gr>
Tue, 7 Feb 2012 15:07:17 +0000 (17:07 +0200)

Trivial merge