From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 5 May 2011 11:21:55 +0000 (+0300)
Subject: #11997: merge with 3.2.
X-Git-Tag: v3.3.0a1~2402^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=868fc875916556e3e65b3da83d2356ee1f681f71;p=python

#11997: merge with 3.2.
---

868fc875916556e3e65b3da83d2356ee1f681f71