From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 24 Mar 2011 15:39:34 +0000 (+0100)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~2769
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f09e652a0e2d71696e0163565bcb4cc6020e4775;p=python

Merge 3.2
---

f09e652a0e2d71696e0163565bcb4cc6020e4775