From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 21 Apr 2011 11:49:56 +0000 (+0300)
Subject: #11897: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2530
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5149eedddfd73e4902cb660047b0261360352fa1;p=python

#11897: Merge with 3.2.
---

5149eedddfd73e4902cb660047b0261360352fa1