From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 19 Jul 2014 20:45:24 +0000 (+0100)
Subject: Issue #22006: Merge from 3.4.
X-Git-Tag: v3.5.0a1~1257
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=866bbf1cf541aadc641c5b9ac550d14e4914eb95;p=thirdparty%2FPython%2Fcpython.git

Issue #22006: Merge from 3.4.
---

866bbf1cf541aadc641c5b9ac550d14e4914eb95