From: Georg Brandl <georg@python.org>
Date: Mon, 25 Mar 2013 05:56:31 +0000 (+0100)
Subject: merge with main repo 3.2 branch
X-Git-Tag: v3.2.4rc1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4eb5f1a56702399ea3bc4553433e7ca9b37be18c;p=python

merge with main repo 3.2 branch
---

4eb5f1a56702399ea3bc4553433e7ca9b37be18c