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

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

a13660807eec3476bb527061d0130aa700a96908