From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Mar 2014 00:14:48 +0000 (-0500)
Subject: merge 3.3 (#20249)
X-Git-Tag: v3.4.1rc1~233^2~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24a945cc6b5ab24854e10fc519877099b38443c3;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#20249)
---

24a945cc6b5ab24854e10fc519877099b38443c3