From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 3 Jul 2011 21:27:41 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1977
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=536feac7f863c64f32c3bba492b79ddf03323373;p=python

merge 3.2
---

536feac7f863c64f32c3bba492b79ddf03323373