From: Thomas Wouters <thomas@python.org>
Date: Sun, 6 Mar 2011 19:52:15 +0000 (-0800)
Subject: Merge 3.2.
X-Git-Tag: v3.3.0a1~2979
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63bd5f9fe32d54057ac7e96bf00fef22ecbf92c4;p=python

Merge 3.2.
---

63bd5f9fe32d54057ac7e96bf00fef22ecbf92c4