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

Merge with 3.2.
---

87903c14bc6536ea0ef6d1505eb46629937fc102