From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 8 Apr 2014 14:44:50 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1929
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc91330efb96fc66dc02f2b75f1dc6ad2f6523e3;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

bc91330efb96fc66dc02f2b75f1dc6ad2f6523e3