From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 26 Mar 2011 17:39:55 +0000 (+0100)
Subject: Merge from 3.2
X-Git-Tag: v3.3.0a1~2747
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a01b9f91ba9772940be27363f01f62b4b50909d;p=python

Merge from 3.2
---

0a01b9f91ba9772940be27363f01f62b4b50909d