From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 Sep 2013 14:53:59 +0000 (-0400)
Subject: merge 3.3 (#19117)
X-Git-Tag: v3.4.0a4~311^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=353d4509289c684056703435b4552434ae0bd8e3;p=python

merge 3.3 (#19117)
---

353d4509289c684056703435b4552434ae0bd8e3