From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 27 Jun 2011 22:50:14 +0000 (-0500)
Subject: merge 3.2 (#11302)
X-Git-Tag: v3.3.0a1~2032
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9df8874b41132ab643d75175f8ed49781eb03e8e;p=python

merge 3.2 (#11302)
---

9df8874b41132ab643d75175f8ed49781eb03e8e