From: Georg Brandl <georg@python.org>
Date: Sat, 16 Apr 2011 15:07:06 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2572
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfd5a32ecdb130b62396120b4841b911667b887e;p=python

Merge with 3.2.
---

bfd5a32ecdb130b62396120b4841b911667b887e