From: Georg Brandl <georg@python.org>
Date: Sun, 24 Jun 2012 18:02:59 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0b1~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb1c8b70552b9fc9ed04aa2c4632b7e2f1240cdb;p=python

Merge with 3.2.
---

cb1c8b70552b9fc9ed04aa2c4632b7e2f1240cdb