From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 21 Sep 2012 13:31:24 +0000 (+0300)
Subject: #15980: merge with 3.2.
X-Git-Tag: v3.3.1rc1~818^2^2~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b15ee0d6e72ec91cbd2ec178bf2ae77cbd33b59;p=thirdparty%2FPython%2Fcpython.git

#15980: merge with 3.2.
---

8b15ee0d6e72ec91cbd2ec178bf2ae77cbd33b59