From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 22 Jan 2013 20:49:46 +0000 (+0200)
Subject: #11379: merge with 3.2.
X-Git-Tag: v3.3.1rc1~310
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=564e4d8dc9b918b5efaada336ab3bf595176d175;p=python

#11379: merge with 3.2.
---

564e4d8dc9b918b5efaada336ab3bf595176d175