From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 26 Apr 2014 17:36:35 +0000 (-0400)
Subject: merge 3.4 (#21355)
X-Git-Tag: v3.5.0a1~1792
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e746f237354f9fe345743616c40b96229910590;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#21355)
---

5e746f237354f9fe345743616c40b96229910590