From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 30 Apr 2013 13:34:30 +0000 (+0300)
Subject: #17881: merge with 3.3.
X-Git-Tag: v3.4.0a1~826
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f256f5f3ebf6574a2708cfea36d857846893e71f;p=python

#17881: merge with 3.3.
---

f256f5f3ebf6574a2708cfea36d857846893e71f