From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 14 Jan 2014 05:22:50 +0000 (-0500)
Subject: merge 3.3 (#20251)
X-Git-Tag: v3.4.0b3~153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=901acb4d897a2a87554a5355f9cd30dd3e0ce422;p=python

merge 3.3 (#20251)
---

901acb4d897a2a87554a5355f9cd30dd3e0ce422