From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 9 May 2011 15:42:32 +0000 (+0300)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2335
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fffaab1ad588337011a5db141f6347d9e3c916d;p=python

Merge with 3.2.
---

5fffaab1ad588337011a5db141f6347d9e3c916d