From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 14 Jan 2014 04:56:30 +0000 (-0500)
Subject: merge 3.3 (#20250)
X-Git-Tag: v3.4.0b3~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e19d9d1467ef209fbcd4d9a55e4ba5e0861eff5f;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#20250)
---

e19d9d1467ef209fbcd4d9a55e4ba5e0861eff5f