From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Fri, 10 Jun 2011 14:38:38 +0000 (+0200)
Subject: null merge 3.2 (patch already applied to 3.3)
X-Git-Tag: v3.3.0a1~2137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff9b5c76ab1d087aa1f4e88db42fcce0f67a81a6;p=thirdparty%2FPython%2Fcpython.git

null merge 3.2 (patch already applied to 3.3)
---

ff9b5c76ab1d087aa1f4e88db42fcce0f67a81a6