Merge branch 'master' of https://code.grnet.gr/git/pithos
authorroot <root@pithos.dev.grnet.gr>
Mon, 7 Nov 2011 16:50:34 +0000 (18:50 +0200)
committerroot <root@pithos.dev.grnet.gr>
Mon, 7 Nov 2011 16:50:34 +0000 (18:50 +0200)

Trivial merge