From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 30 Sep 2012 19:48:20 +0000 (+0300)
Subject: #15923: merge with 3.3.
X-Git-Tag: v3.4.0a1~2434
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f1c5c0f64f6a5634d43e55bc9f5504c49d5eb68;p=python

#15923: merge with 3.3.
---

2f1c5c0f64f6a5634d43e55bc9f5504c49d5eb68