From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 24 May 2011 17:09:47 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2183^2~128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b325b0acef6f94390ecd094e5935a3aeef7bef1;p=python

merge 3.2
---

9b325b0acef6f94390ecd094e5935a3aeef7bef1