From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 20 Feb 2014 04:06:41 +0000 (-0500)
Subject: merge 3.3 (#20695)
X-Git-Tag: v3.4.1rc1~233^2~266
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88a928b6142c0ab3a9ab799b1652bb6d64e7face;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#20695)
---

88a928b6142c0ab3a9ab799b1652bb6d64e7face