From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 1 Jun 2011 02:28:03 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2183^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2945a998409fcbc507330c49b870aea8e819a00f;p=python

merge 3.2
---

2945a998409fcbc507330c49b870aea8e819a00f