From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 15 May 2013 03:32:34 +0000 (-0500)
Subject: null merge 3.3 from backport
X-Git-Tag: v3.4.0a1~727
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9aed17ff7f800c45e9ee9d344e3a56e284f60169;p=python

null merge 3.3 from backport
---

9aed17ff7f800c45e9ee9d344e3a56e284f60169