From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 23 May 2011 21:35:12 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2183^2~140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17ec7cd9ca28ae2e8320a740d00927dcaed67274;p=python

merge 3.2
---

17ec7cd9ca28ae2e8320a740d00927dcaed67274