From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 12 Mar 2014 23:10:57 +0000 (-0500)
Subject: merge 3.3 (#20896)
X-Git-Tag: v3.4.1rc1~233^2~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8546e226bd0b6332ea5af551b9bbd74c2707a3ea;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#20896)
---

8546e226bd0b6332ea5af551b9bbd74c2707a3ea