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

merge 3.3 (#19112)
---

70157e8f0276b751a3628ebefb5582c215fd2deb