From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 14 Jul 2011 15:03:53 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1909
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c917494528b3e116d4d17df52daea74f112e2b68;p=python

merge 3.2
---

c917494528b3e116d4d17df52daea74f112e2b68