Merge branch 'master' of https://code.grnet.gr/git/pithos
authorroot <root@pithos.dev.grnet.gr>
Wed, 14 Dec 2011 14:25:55 +0000 (16:25 +0200)
committerroot <root@pithos.dev.grnet.gr>
Wed, 14 Dec 2011 14:25:55 +0000 (16:25 +0200)

Trivial merge