From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 24 Sep 2012 14:31:37 +0000 (+0300)
Subject: #16019, #16020: merge with 3.2.
X-Git-Tag: v3.3.1rc1~818^2^2~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8a2865482088b10f3230ece00421bad6e2337f2;p=thirdparty%2FPython%2Fcpython.git

#16019, #16020: merge with 3.2.
---

f8a2865482088b10f3230ece00421bad6e2337f2