From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 Sep 2013 15:15:49 +0000 (-0400)
Subject: merge 3.3 (#19127)
X-Git-Tag: v3.4.0a4~311^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84c1205043684542e83e653cbc3863e4d7d9a241;p=python

merge 3.3 (#19127)
---

84c1205043684542e83e653cbc3863e4d7d9a241