From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Dec 2012 16:21:02 +0000 (-0500)
Subject: merge 3.3 (#16585)
X-Git-Tag: v3.4.0a1~1916
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26e5335a46f34944da7fd20ab8b1574fae6a5585;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#16585)
---

26e5335a46f34944da7fd20ab8b1574fae6a5585