From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 8 May 2012 02:24:05 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a4~228
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=869b1f907034e2d0299b45362ed0dc30269269ee;p=python

merge 3.2
---

869b1f907034e2d0299b45362ed0dc30269269ee