From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 16 Jun 2011 23:50:21 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=364cbb8ca4b9d7c564bf09e0d14dd9f0f77778d6;p=python

merge 3.2
---

364cbb8ca4b9d7c564bf09e0d14dd9f0f77778d6