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

merge 3.4
---

1d1d95bf838757b6fbcaa8b6edaaa357772150a4