From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 8 Mar 2011 04:52:31 +0000 (-0600)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2974
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a393bb7718769cef70524bc49c48017ea358a065;p=python

merge 3.2
---

a393bb7718769cef70524bc49c48017ea358a065