From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 3 Nov 2012 18:33:38 +0000 (+0200)
Subject: #12759: merge with 3.2.
X-Git-Tag: v3.3.1rc1~694
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68600aff3a841c1d901758c0e4e3fb3aafc7354e;p=thirdparty%2FPython%2Fcpython.git

#12759: merge with 3.2.
---

68600aff3a841c1d901758c0e4e3fb3aafc7354e