From: Georg Brandl <georg@python.org>
Date: Tue, 28 Feb 2012 07:21:49 +0000 (+0100)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86798d4ff96422fde089e51d92a565c24248096a;p=python

Merge with 3.2.
---

86798d4ff96422fde089e51d92a565c24248096a