From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 10 Aug 2013 15:57:52 +0000 (+0300)
Subject: #18505: merge with 3.3.
X-Git-Tag: v3.4.0a2~261
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1e639a0f4603b42db60cc21c3ca924ae148dbfd;p=thirdparty%2FPython%2Fcpython.git

#18505: merge with 3.3.
---

a1e639a0f4603b42db60cc21c3ca924ae148dbfd