From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 10 Apr 2014 04:24:47 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1912
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82f69fd93bda1d176b8d8b3e080a576bd2f97c98;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

82f69fd93bda1d176b8d8b3e080a576bd2f97c98