From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 15 Feb 2014 18:20:28 +0000 (-0500)
Subject: merge 3.3 (#20080)
X-Git-Tag: v3.4.1rc1~233^2~321
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ef48d9c791f2dba840fd92bebdcb5f82d24eeca;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#20080)
---

5ef48d9c791f2dba840fd92bebdcb5f82d24eeca