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

merge 3.2
---

197a59f49b1b3e99e04144b25b4bf8bf233e69df