From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 20 Jan 2014 05:12:24 +0000 (-0500)
Subject: merge 3.3 (#6627)
X-Git-Tag: v3.4.0b3~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27b490c71385341ce32c6540d98632032c440159;p=python

merge 3.3 (#6627)
---

27b490c71385341ce32c6540d98632032c440159