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

#20977: merge with 3.4.
---

c734c387dee2f71f25e3dee0b2566f7eca960741