From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 13 Mar 2014 02:42:04 +0000 (-0500)
Subject: merge 3.3 (#19060)
X-Git-Tag: v3.4.1rc1~233^2~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=605765fa32f994778ae7d6c48945299228f111e5;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#19060)
---

605765fa32f994778ae7d6c48945299228f111e5