From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 May 2011 01:24:59 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2437
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0255973af68e03697921ec862abd811fc08dfd6d;p=python

merge 3.2
---

0255973af68e03697921ec862abd811fc08dfd6d