From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 20 Apr 2011 18:33:29 +0000 (+0300)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2540
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32f4db3175a88f21a90791eafe01cac6d763877d;p=python

Merge with 3.2.
---

32f4db3175a88f21a90791eafe01cac6d763877d