From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 2 Apr 2014 16:16:55 +0000 (-0400)
Subject: merge 3.4 (#21134)
X-Git-Tag: v3.5.0a1~1961
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d818fc9205d9121cde28a9cc2123772fcc531f29;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#21134)
---

d818fc9205d9121cde28a9cc2123772fcc531f29