From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 20 Apr 2012 12:37:17 +0000 (+0200)
Subject: merge 3.2: issue 14629
X-Git-Tag: v3.3.0a3~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63c39fe38e54c986a70dd9f97acf444837d1d244;p=python

merge 3.2: issue 14629
---

63c39fe38e54c986a70dd9f97acf444837d1d244