From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 24 Mar 2013 21:53:04 +0000 (+0100)
Subject: #17425: merge 3.3
X-Git-Tag: v3.4.0a1~1094
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fe5b4ead3aba166b46d66f809dc5c446e3c61d9;p=python

#17425: merge 3.3
---

5fe5b4ead3aba166b46d66f809dc5c446e3c61d9