From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 23 May 2011 12:58:07 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~2183^2~149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6881701fba738db55e13d92b4f4770ffd5114c9;p=python

Merge 3.2
---

d6881701fba738db55e13d92b4f4770ffd5114c9