From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 23 Apr 2014 15:04:55 +0000 (-0500)
Subject: Merge from 3.4
X-Git-Tag: v3.5.0a1~1805
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ede86f5b7342a301c7b7f1e7fd947c6349e1cf9a;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.4
---

ede86f5b7342a301c7b7f1e7fd947c6349e1cf9a