From: Donald Stufft <donald@stufft.io>
Date: Mon, 24 Mar 2014 23:28:08 +0000 (-0400)
Subject: Merge in 3.4 to bring forward the Issue #21043 changes.
X-Git-Tag: v3.5.0a1~2032
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eaeb955f4818896bd552770d55affabeab066836;p=thirdparty%2FPython%2Fcpython.git

Merge in 3.4 to bring forward the Issue #21043 changes.
---

eaeb955f4818896bd552770d55affabeab066836