From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 23 May 2011 12:57:05 +0000 (+0200)
Subject: Merge 3.1
X-Git-Tag: v3.2.1rc2~134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b43dd4b8ca2deaeab818fa996330ad8fe99b09e6;p=python

Merge 3.1
---

b43dd4b8ca2deaeab818fa996330ad8fe99b09e6