From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 23 Nov 2011 05:57:50 +0000 (-0600)
Subject: merge 3.2 (null)
X-Git-Tag: v3.3.0a1~740
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=759345ff8df1c6b106c64058517a2dd76f07c289;p=python

merge 3.2 (null)
---

759345ff8df1c6b106c64058517a2dd76f07c289