From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 14 May 2011 06:23:52 +0000 (+0300)
Subject: #11979: merge with 3.1.
X-Git-Tag: v3.3.0a1~2282^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=132bcf472419b5bbdecb492676df961731bc2175;p=python

#11979: merge with 3.1.
---

132bcf472419b5bbdecb492676df961731bc2175