From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 17 Apr 2014 22:29:27 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1831
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af7c5b0bb556c33d0d4b710ae1c5477abf7fc0d8;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

af7c5b0bb556c33d0d4b710ae1c5477abf7fc0d8