From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 29 Apr 2013 14:23:31 +0000 (-0400)
Subject: merge 3.3 (#17863)
X-Git-Tag: v3.4.0a1~833
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bb83f812f2a253d478c1a4f33e4b10685c5c5db;p=python

merge 3.3 (#17863)
---

0bb83f812f2a253d478c1a4f33e4b10685c5c5db