From: Georg Brandl <georg@python.org>
Date: Sun, 24 Jun 2012 20:50:30 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0b1~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56ed2844fa88882a91f9ccf670c0e7a9736eb2a2;p=python

Merge with 3.2.
---

56ed2844fa88882a91f9ccf670c0e7a9736eb2a2