From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 6 Sep 2011 11:56:47 +0000 (-0400)
Subject: merge 3.2 (#1616)
X-Git-Tag: v3.3.0a1~1571
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d8f744730c0689d822db1a2425170d7d5d44aca;p=python

merge 3.2 (#1616)
---

6d8f744730c0689d822db1a2425170d7d5d44aca