From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 8 Jul 2013 15:53:32 +0000 (+0200)
Subject: #18403: merge with 3.3.
X-Git-Tag: v3.4.0a1~290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d95bb3f981a2fc6a9637fa84a85cb06ec978860a;p=python

#18403: merge with 3.3.
---

d95bb3f981a2fc6a9637fa84a85cb06ec978860a