From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Mar 2014 19:07:25 +0000 (-0400)
Subject: merge 3.4 (#21105)
X-Git-Tag: v3.5.0a1~1986
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba6eba0850aba59b9968c1d4b465dbf8e6f2cdca;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#21105)
---

ba6eba0850aba59b9968c1d4b465dbf8e6f2cdca