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

Merge with 3.2.
---

60480454bc57c2a52225ca7ed4cb1374e707e73a