From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 6 Jul 2013 15:17:45 +0000 (+0200)
Subject: #18380: merge with 3.3.
X-Git-Tag: v3.4.0a1~321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0a39de647902d836e2acf680d8cfc5caa21460f;p=python

#18380: merge with 3.3.
---

e0a39de647902d836e2acf680d8cfc5caa21460f