From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 3 Dec 2011 21:40:23 +0000 (+0100)
Subject: Merge from 3.2
X-Git-Tag: v3.3.0a1~686
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61fed9ccd3a3415d1d6fabc7cb9fad0c2a01de79;p=python

Merge from 3.2
---

61fed9ccd3a3415d1d6fabc7cb9fad0c2a01de79