From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 19 Jun 2014 21:55:10 +0000 (+0300)
Subject: #21690: merge with 3.4.
X-Git-Tag: v3.5.0a1~1443^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9dca5357cc4769c2708f0daece554bc3151993a2;p=thirdparty%2FPython%2Fcpython.git

#21690: merge with 3.4.
---

9dca5357cc4769c2708f0daece554bc3151993a2