From: Éric Araujo <merwok@netwok.org>
Date: Sun, 1 May 2011 00:09:37 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v2.7.2rc1~85^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a27c8e37465b4a452e2b64af26062e133e968f42;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

a27c8e37465b4a452e2b64af26062e133e968f42