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

merge 3.2
---

f17101a3077f1df02eee356f1cbe07c7dea211a0