From: Éric Araujo <merwok@netwok.org>
Date: Sun, 29 May 2011 16:08:34 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~2183^2~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7390669141de086909e9c55503d1b54ac8974bf;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

c7390669141de086909e9c55503d1b54ac8974bf