From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 26 May 2014 22:11:11 +0000 (-0700)
Subject: merge 3.4 (#21586)
X-Git-Tag: v3.5.0a1~1590
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ecb1928cb3a46c6cb050ea5bb5b3c1a9b263a3d;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#21586)
---

3ecb1928cb3a46c6cb050ea5bb5b3c1a9b263a3d