From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 15 May 2011 16:59:29 +0000 (+0200)
Subject: Null merge 3.1 (fix already applied: 4a82be47a948+5060a92a8597).
X-Git-Tag: v3.2.1rc2~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83d8a99ac7fc10862d44343d5c15d376004f2ff3;p=thirdparty%2FPython%2Fcpython.git

Null merge 3.1 (fix already applied: 4a82be47a948+5060a92a8597).
---

83d8a99ac7fc10862d44343d5c15d376004f2ff3