From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 7 Mar 2011 00:10:58 +0000 (-0600)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2977
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b29ab1392a826baeaa9aab0deb47370db365524;p=python

merge 3.2
---

2b29ab1392a826baeaa9aab0deb47370db365524