From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 18 Apr 2014 20:45:02 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1821
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dee46b370e9856e6bbeb624513cd2fb2fa0dbdf2;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

dee46b370e9856e6bbeb624513cd2fb2fa0dbdf2