From: Georg Brandl <georg@python.org>
Date: Sat, 11 Aug 2012 08:59:45 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0rc1~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68fad6fb377db515f536943910895302900caa82;p=python

Merge with 3.2.
---

68fad6fb377db515f536943910895302900caa82