From: Georg Brandl <georg@python.org>
Date: Sat, 13 Aug 2011 09:48:40 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~1702
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74b6abf61f88221c4c859623a75655dcb214e072;p=python

Merge with 3.2.
---

74b6abf61f88221c4c859623a75655dcb214e072