From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 29 Jul 2014 14:36:20 +0000 (+0300)
Subject: #21704: merge with 3.4.
X-Git-Tag: v3.5.0a1~1166
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6aa4269ed25f7fdddd99fe1d7b09b8406ecb05ea;p=thirdparty%2FPython%2Fcpython.git

#21704: merge with 3.4.
---

6aa4269ed25f7fdddd99fe1d7b09b8406ecb05ea