From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 6 Jul 2014 17:59:19 +0000 (+0300)
Subject: #20135: merge with 3.4.
X-Git-Tag: v3.5.0a1~1340
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f6b1034401ef87b490fac3a48c896aad23c9da1;p=python

#20135: merge with 3.4.
---

1f6b1034401ef87b490fac3a48c896aad23c9da1