From: Ned Deily <nad@acm.org>
Date: Wed, 9 Apr 2014 00:47:48 +0000 (-0700)
Subject: Issue #20644: merge from 3.4
X-Git-Tag: v3.5.0a1~1921
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5ed2c1cd2ff9e8d8d0c387506adef5340cfd2f0;p=thirdparty%2FPython%2Fcpython.git

Issue #20644: merge from 3.4
---

d5ed2c1cd2ff9e8d8d0c387506adef5340cfd2f0