From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 24 Apr 2014 18:22:47 +0000 (-0500)
Subject: Closes #21346: Merge with 3.4
X-Git-Tag: v3.5.0a1~1798
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7101cb07ef8cb9e63b99b0e1c8200f355841772c;p=thirdparty%2FPython%2Fcpython.git

Closes #21346: Merge with 3.4
---

7101cb07ef8cb9e63b99b0e1c8200f355841772c