Merge branch 'master' of https://code.grnet.gr/git/pithos
authorChristos Stathis <chstath@ebs.gr>
Mon, 7 Nov 2011 10:47:16 +0000 (12:47 +0200)
committerChristos Stathis <chstath@ebs.gr>
Mon, 7 Nov 2011 10:47:16 +0000 (12:47 +0200)

Trivial merge