From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 22 Sep 2012 08:25:22 +0000 (+0300)
Subject: #15949, 15899: merge with 3.2.
X-Git-Tag: v3.3.1rc1~818^2^2~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb436c4ebaff171cfff789e702dbc6b5a00281cf;p=thirdparty%2FPython%2Fcpython.git

#15949, 15899: merge with 3.2.
---

fb436c4ebaff171cfff789e702dbc6b5a00281cf