From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 19 Jun 2011 22:49:22 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2090
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=019d0f27a3fc8d4daa7caea8c041cd26d5873950;p=python

merge 3.2
---

019d0f27a3fc8d4daa7caea8c041cd26d5873950