From: Éric Araujo <merwok@netwok.org>
Date: Wed, 23 Mar 2011 03:52:45 +0000 (+0100)
Subject: Merge from 3.2
X-Git-Tag: v3.3.0a1~2787
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83e7a2b7db047d70d29800a0f8d5c5beab5c936d;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.2
---

83e7a2b7db047d70d29800a0f8d5c5beab5c936d