From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 23 Sep 2012 13:03:21 +0000 (+0300)
Subject: #15949, #15899: merge with 3.2.
X-Git-Tag: v3.3.1rc1~818^2^2~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b7a71d6e592dcc8257b1007fffd2fdd3cd193af;p=thirdparty%2FPython%2Fcpython.git

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

2b7a71d6e592dcc8257b1007fffd2fdd3cd193af