From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 27 Nov 2013 05:05:37 +0000 (-0600)
Subject: merge 3.3 (#19805)
X-Git-Tag: v3.4.0b2~458
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5143ce5a01438280a699c15aea1738fdfc9ceb45;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#19805)
---

5143ce5a01438280a699c15aea1738fdfc9ceb45