From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 14 May 2011 03:24:18 +0000 (+0300)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2285
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e03e9dc8d741514867b0ad1301d1d9e53885895;p=python

Merge with 3.2.
---

4e03e9dc8d741514867b0ad1301d1d9e53885895