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

merge 3.3 (#20901)
---

a6d018ad6ef05c4b843d92c206f3bf48fdf25653