From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 8 Jun 2013 22:05:16 +0000 (+0300)
Subject: #18126: merge with 3.3.
X-Git-Tag: v3.4.0a1~548
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dc4c03344e7d356f5f6080258f03b7d6db6aa96;p=thirdparty%2FPython%2Fcpython.git

#18126: merge with 3.3.
---

7dc4c03344e7d356f5f6080258f03b7d6db6aa96