From: Georg Brandl <georg@python.org>
Date: Sat, 23 Jul 2011 06:06:00 +0000 (+0200)
Subject: Merge 3.2 branch.
X-Git-Tag: v3.3.0a1~1857
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=deb852db71dbe3f0b6928db94f74608ab7bfb8fb;p=python

Merge 3.2 branch.
---

deb852db71dbe3f0b6928db94f74608ab7bfb8fb