From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 21 Jun 2011 03:09:20 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2074
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28db0fd3575ebe5f155d4e04fcfaebc33957ae28;p=python

merge 3.2
---

28db0fd3575ebe5f155d4e04fcfaebc33957ae28