From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 6 Sep 2014 10:40:00 +0000 (+1000)
Subject: Merge issue #22295 fix from 3.4
X-Git-Tag: v3.5.0a1~950
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a4b67951570a8a0452c77a5ebaa98b9ef9fb712;p=thirdparty%2FPython%2Fcpython.git

Merge issue #22295 fix from 3.4
---

4a4b67951570a8a0452c77a5ebaa98b9ef9fb712