From: Ned Deily <nad@acm.org>
Date: Mon, 5 Jan 2015 09:05:36 +0000 (-0800)
Subject: Issue #22165: merge from 3.4
X-Git-Tag: v3.5.0a1~246
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04c365d7fb8204d1178dab0e9030f86bb54894aa;p=thirdparty%2FPython%2Fcpython.git

Issue #22165: merge from 3.4
---

04c365d7fb8204d1178dab0e9030f86bb54894aa