From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 26 Oct 2012 16:33:37 +0000 (+0300)
Subject: #16317: merge with 3.3.
X-Git-Tag: v3.4.0a1~2166^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=afa46abab8fa738bec5bb0e6ba85aea9cf353ae0;p=python

#16317: merge with 3.3.
---

afa46abab8fa738bec5bb0e6ba85aea9cf353ae0