From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 1 Apr 2014 23:21:57 +0000 (-0400)
Subject: merge 3.4 (#21082)
X-Git-Tag: v3.5.0a1~1967
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18395290c380c8051ec5577f8886c1159eb54cef;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#21082)
---

18395290c380c8051ec5577f8886c1159eb54cef