From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 13 Apr 2013 17:12:53 +0000 (+0300)
Subject: #17571: merge with 3.3.
X-Git-Tag: v3.4.0a1~960
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d24abee4632a233d17eaad0ab962c97545e387b3;p=python

#17571: merge with 3.3.
---

d24abee4632a233d17eaad0ab962c97545e387b3