From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 4 Apr 2014 13:52:18 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1952^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faf1965a067b4b8a99e8090c47cb79f4e2618574;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

faf1965a067b4b8a99e8090c47cb79f4e2618574