From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 27 Jun 2011 14:19:02 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2036
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=345a5d735706a9ab41f1a682ed34815086970bb0;p=python

merge 3.2
---

345a5d735706a9ab41f1a682ed34815086970bb0