From: Jason R. Coombs <jaraco@jaraco.com>
Date: Fri, 2 Sep 2016 02:00:03 +0000 (-0400)
Subject: Merge backout for test suite fix
X-Git-Tag: v3.6.0b1~499
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9650b19212c6dcd30e3e4e077403863cd931c50a;p=thirdparty%2FPython%2Fcpython.git

Merge backout for test suite fix
---

9650b19212c6dcd30e3e4e077403863cd931c50a