From: Ned Deily <nad@acm.org>
Date: Sun, 4 May 2014 02:25:34 +0000 (-0700)
Subject: Issue #18604: merge from 3.4
X-Git-Tag: v3.5.0a1~1737
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71ac07f8baf21bf7a116e97accc12804f1afcdd4;p=thirdparty%2FPython%2Fcpython.git

Issue #18604: merge from 3.4
---

71ac07f8baf21bf7a116e97accc12804f1afcdd4