From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Mar 2014 21:16:18 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1982
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af2b3f4f3e7a1d4c2e17780ffd1a682ecce2d79e;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

af2b3f4f3e7a1d4c2e17780ffd1a682ecce2d79e