From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 10 May 2011 22:23:41 +0000 (+0300)
Subject: #12051: merge with 3.2.
X-Git-Tag: v3.3.0a1~2314
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8d6fd605dafe63300ecdf77353d4a3bac02e362;p=python

#12051: merge with 3.2.
---

f8d6fd605dafe63300ecdf77353d4a3bac02e362