From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 10 May 2011 22:58:26 +0000 (+0200)
Subject: Merge 3.1 (empty merge, a similar patch was already applied)
X-Git-Tag: v3.2.1rc1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd2e94d80c4f291a7d382db5756efd8ec26aa9e7;p=python

Merge 3.1 (empty merge, a similar patch was already applied)
---

dd2e94d80c4f291a7d382db5756efd8ec26aa9e7