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

merge 3.4
---

f63ea3d148e50fa6d0d6eac7fa2af15415618103