From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 25 Aug 2013 21:17:21 +0000 (+0300)
Subject: #18833: merge with 3.3.
X-Git-Tag: v3.4.0a2~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec42975bc66706554ae29b3884bdaaa6b26c487c;p=python

#18833: merge with 3.3.
---

ec42975bc66706554ae29b3884bdaaa6b26c487c