From: Brett Cannon <brett@python.org>
Date: Fri, 4 Apr 2014 14:03:42 +0000 (-0400)
Subject: merge of fix for issue #20942
X-Git-Tag: v3.5.0a1~1953
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7ef80583320cdb9a76bc47ba5c24ecc1801a282;p=thirdparty%2FPython%2Fcpython.git

merge of fix for issue #20942
---

e7ef80583320cdb9a76bc47ba5c24ecc1801a282