From: Éric Araujo <merwok@netwok.org>
Date: Thu, 25 Aug 2011 23:17:56 +0000 (+0200)
Subject: Merge from 3.2 (#9302 fix and other changes)
X-Git-Tag: v3.3.0a1~1615^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d9dcd185c1f0716b20ecf5d3cb6fc4ef2c16874;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.2 (#9302 fix and other changes)
---

8d9dcd185c1f0716b20ecf5d3cb6fc4ef2c16874