From: Georg Brandl <georg@python.org>
Date: Tue, 27 Mar 2012 05:46:54 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a2~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc5a4e16118caeac1168b6f47e580d388f101bfd;p=python

merge with 3.2
---

dc5a4e16118caeac1168b6f47e580d388f101bfd