From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 21 Apr 2011 13:13:44 +0000 (+0300)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2528
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bba6c278580999edf1ef61eb1f1fe3388333fd3;p=python

Merge with 3.2.
---

5bba6c278580999edf1ef61eb1f1fe3388333fd3