From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 27 Mar 2011 19:07:13 +0000 (+0200)
Subject: merge #11696
X-Git-Tag: v3.2.1b1~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=987403bf1494b2f10d27f9be6bf624d7d920dbaf;p=python

merge #11696
---

987403bf1494b2f10d27f9be6bf624d7d920dbaf