From: Berker Peksag <berker.peksag@gmail.com>
Date: Wed, 9 Jul 2014 17:16:23 +0000 (+0300)
Subject: Issues #21948 and #16040: Merge with 3.4.
X-Git-Tag: v3.5.0a1~1308
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0be663062ade859fafdef448c1f0c70005e1eb17;p=thirdparty%2FPython%2Fcpython.git

Issues #21948 and #16040: Merge with 3.4.
---

0be663062ade859fafdef448c1f0c70005e1eb17