From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 15 Aug 2011 11:28:46 +0000 (+0300)
Subject: #12204: merge with 3.2.
X-Git-Tag: v3.3.0a1~1693
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae0cbde2314b5aa939296ad36b4fabc7218e56ed;p=thirdparty%2FPython%2Fcpython.git

#12204: merge with 3.2.
---

ae0cbde2314b5aa939296ad36b4fabc7218e56ed