From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 16 Jul 2013 03:47:47 +0000 (-0700)
Subject: merge 3.3 (closes #18470)
X-Git-Tag: v3.4.0a1~195
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd9c0203deca2be420a245f30954babf3600a47e;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (closes #18470)
---

fd9c0203deca2be420a245f30954babf3600a47e