From: Éric Araujo <merwok@netwok.org>
Date: Thu, 3 Nov 2011 04:17:11 +0000 (+0100)
Subject: Merge follow-up for #11254 and other changes from 3.2
X-Git-Tag: v3.3.0a1~967^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e64052176d998a0f1397fc5fa60875e2f0371296;p=thirdparty%2FPython%2Fcpython.git

Merge follow-up for #11254 and other changes from 3.2
---

e64052176d998a0f1397fc5fa60875e2f0371296