From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Sat, 29 Mar 2014 22:14:52 +0000 (-0600)
Subject: Null merge from 3.4.
X-Git-Tag: v3.5.0a1~1993
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5302c63f568a7272c5479e254ae2d9a29db131e;p=thirdparty%2FPython%2Fcpython.git

Null merge from 3.4.
---

b5302c63f568a7272c5479e254ae2d9a29db131e