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

merge 3.4
---

e44b947a9df1939c7cabd54bc20fe2b2027d04ac