From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 6 May 2014 14:19:16 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1727
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed49265b91222b1c1c7e5fe9c923cbd7651d788d;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

ed49265b91222b1c1c7e5fe9c923cbd7651d788d