From: Georg Brandl <georg@python.org>
Date: Sun, 1 May 2011 20:37:46 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a1~2443
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c32b4a601951cd29dbc89f9bb9f6047a80bd18c;p=python

merge with 3.2
---

6c32b4a601951cd29dbc89f9bb9f6047a80bd18c