From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 31 Oct 2012 03:31:12 +0000 (-0400)
Subject: merge 3.3 (#16369)
X-Git-Tag: v3.4.0a1~2132
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ff2094bc7e2c6ecb735116b2187187bb4f58daa;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#16369)
---

7ff2094bc7e2c6ecb735116b2187187bb4f58daa