From: Brian Curtin <brian@python.org>
Date: Wed, 13 Apr 2011 21:12:46 +0000 (-0500)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~2592
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00c18cedb26404a39506725ce7c17b19157a3e8c;p=python

Merge 3.2
---

00c18cedb26404a39506725ce7c17b19157a3e8c