Merge https://code.grnet.gr/git/pithos
authorGiorgos Verigakis <verigak@gmail.com>
Wed, 6 Jul 2011 10:35:33 +0000 (13:35 +0300)
committerGiorgos Verigakis <verigak@gmail.com>
Wed, 6 Jul 2011 10:35:33 +0000 (13:35 +0300)

Trivial merge