From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 13 Aug 2013 09:54:29 +0000 (+0300)
Subject: #18687: merge with 3.3.
X-Git-Tag: v3.4.0a2~233
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9eaa3e6732debf6a633f44cf3c82a0eaf8879a51;p=thirdparty%2FPython%2Fcpython.git

#18687: merge with 3.3.
---

9eaa3e6732debf6a633f44cf3c82a0eaf8879a51