From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 20 Dec 2012 18:55:15 +0000 (-0600)
Subject: merge 3.3 (#16597)
X-Git-Tag: v3.4.0a1~1808
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=302c65443e2470b68dd1acae8aa9fba26215a9c6;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#16597)
---

302c65443e2470b68dd1acae8aa9fba26215a9c6