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

merge 3.3 (#20507)
---

4267869ad892520ef26dc403b988ef6b5b3fe428