From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 14 Apr 2011 04:51:57 +0000 (+0300)
Subject: #11840: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2590
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c470a0c744d484b707cc14bc92883bb2ee8c32c8;p=python

#11840: Merge with 3.2.
---

c470a0c744d484b707cc14bc92883bb2ee8c32c8