From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 1 Apr 2014 20:27:35 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1968
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80f6759c09cf446c90313b99dd04eeb04dd7f115;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

80f6759c09cf446c90313b99dd04eeb04dd7f115