From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 16 Apr 2011 20:14:40 +0000 (+0300)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2569
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2476ee32b181a3270b7ae85b60f21e64be9df13b;p=python

Merge with 3.2.
---

2476ee32b181a3270b7ae85b60f21e64be9df13b