From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 15 Jun 2014 01:52:14 +0000 (-0700)
Subject: merge 3.4 (#21764)
X-Git-Tag: v3.5.0a1~1443^2~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a0b6aa59bbc1ff204a48c53876d57a2c6bbf818;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#21764)
---

3a0b6aa59bbc1ff204a48c53876d57a2c6bbf818