From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 14 Apr 2012 02:52:29 +0000 (-0600)
Subject: #14535: merge with 3.2.
X-Git-Tag: v3.3.0a3~234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=584fbbb32d00435e14433dc892619769d1f8719a;p=thirdparty%2FPython%2Fcpython.git

#14535: merge with 3.2.
---

584fbbb32d00435e14433dc892619769d1f8719a