From: Brett Cannon <brett@python.org>
Date: Fri, 9 May 2014 14:37:55 +0000 (-0400)
Subject: Merge for issue #21157
X-Git-Tag: v3.5.0a1~1713
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f25f25796bbd0ad51fa6b6f57a8c5c7efdf4371f;p=thirdparty%2FPython%2Fcpython.git

Merge for issue #21157
---

f25f25796bbd0ad51fa6b6f57a8c5c7efdf4371f