From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 5 Feb 2013 15:12:31 +0000 (-0500)
Subject: merge 3.3 (#17132)
X-Git-Tag: v3.4.0a1~1441
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c2e193179e8d3b94e14f3d3fb5c69aba641364e;p=python

merge 3.3 (#17132)
---

0c2e193179e8d3b94e14f3d3fb5c69aba641364e