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

#17686: merge with 3.3.
---

5c965dafbd7ba310b91bfc861d8f81dc9e139f31