From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 23 May 2011 22:01:08 +0000 (+0300)
Subject: #12074: merge with 3.2.
X-Git-Tag: v3.3.0a1~2183^2~138^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64af7c0d36ae78881b127643052d43316da9f52c;p=thirdparty%2FPython%2Fcpython.git

#12074: merge with 3.2.
---

64af7c0d36ae78881b127643052d43316da9f52c