From: Georg Brandl <georg@python.org>
Date: Sat, 10 Mar 2012 08:27:30 +0000 (+0100)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a2~246
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6aacc14e2926ad96760822d4ff3a711bee3ba181;p=python

Merge with 3.2.
---

6aacc14e2926ad96760822d4ff3a711bee3ba181