From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 17 Sep 2016 23:34:52 +0000 (-0700)
Subject: Fixes bad merge for issue #28110
X-Git-Tag: v3.7.0a1~2449
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8ef95e3ba0bfdb699b3fdae9de685f7cc343615;p=thirdparty%2FPython%2Fcpython.git

Fixes bad merge for issue #28110
---

e8ef95e3ba0bfdb699b3fdae9de685f7cc343615