From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 16 Apr 2014 20:07:49 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1845
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b581ae9030eb8756772daa65d7ef7034776a7977;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

b581ae9030eb8756772daa65d7ef7034776a7977