From: Georg Brandl <georg@python.org>
Date: Sat, 9 Jul 2011 09:00:36 +0000 (+0200)
Subject: Dummy-merge 3.2.1 release changes into default.
X-Git-Tag: v3.3.0a1~1931
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f514e61f5be3807b96665a92922df6d3abe95e44;p=python

Dummy-merge 3.2.1 release changes into default.
---

f514e61f5be3807b96665a92922df6d3abe95e44