From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Thu, 29 May 2014 18:32:39 +0000 (-0600)
Subject: Issue #21226: Merge from 3.4.
X-Git-Tag: v3.5.0a1~1570
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12c5247be9f30052733d4cda26af5344292582ec;p=thirdparty%2FPython%2Fcpython.git

Issue #21226: Merge from 3.4.
---

12c5247be9f30052733d4cda26af5344292582ec