From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 20 May 2011 16:42:47 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2220
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f071e6e9f463c459d3a9f55dba35993947d574c;p=python

merge 3.2
---

7f071e6e9f463c459d3a9f55dba35993947d574c