From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 4 Aug 2014 23:24:28 +0000 (+0300)
Subject: #11955: merge with 3.4.
X-Git-Tag: v3.5.0a1~1125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0020d8e4fdb2d7fab42ab77e576fac94c230eb67;p=thirdparty%2FPython%2Fcpython.git

#11955: merge with 3.4.
---

0020d8e4fdb2d7fab42ab77e576fac94c230eb67