From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 5 Oct 2012 00:34:02 +0000 (+0300)
Subject: #16127: merge with 3.3.
X-Git-Tag: v3.4.0a1~2368
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=080a2c087e5fa08c44ff121d74ea8ad9d4413c58;p=python

#16127: merge with 3.3.
---

080a2c087e5fa08c44ff121d74ea8ad9d4413c58