Merge branch 'master' of https://code.grnet.gr/git/pithos
authorChristos Stathis <chstath@ebs.gr>
Wed, 23 Nov 2011 14:23:53 +0000 (16:23 +0200)
committerChristos Stathis <chstath@ebs.gr>
Wed, 23 Nov 2011 14:23:53 +0000 (16:23 +0200)

Trivial merge