From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 15 Jul 2011 19:11:45 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1896
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ca3ffb0989e53f8ae70f7177e97f43ac1d1af98;p=python

merge 3.2
---

2ca3ffb0989e53f8ae70f7177e97f43ac1d1af98