From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 7 Jun 2014 19:48:09 +0000 (-0700)
Subject: merge 3.4 (#21404)
X-Git-Tag: v3.5.0a1~1499
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33919e8423784fa0172a0ce2d82ce1248be301bd;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#21404)
---

33919e8423784fa0172a0ce2d82ce1248be301bd