From: Natasa Kapravelou <akapravelou@gmail.com>
Date: Fri, 25 Feb 2011 08:42:23 +0000 (+0200)
Subject: Automated merge with https://gss.googlecode.com/hg/
X-Git-Tag: pithos/v0.7.8~323^2~14^2~22^2~33
X-Git-Url: https://code.grnet.gr/git/pithos/commitdiff_plain/7d94298110a52aa6771dee6da92cb732651a8b96

Automated merge with https://gss.googlecode.com/hg/
---

7d94298110a52aa6771dee6da92cb732651a8b96