From: Georg Brandl <georg@python.org>
Date: Tue, 14 Aug 2012 07:40:26 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0rc1~119
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1487c931cbe62515598473a30eab0e5ac746114f;p=python

merge with 3.2
---

1487c931cbe62515598473a30eab0e5ac746114f