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

Merge with 3.2.
---

5020e000c56a39930816df8d0e5742a113392f8c