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

merge 3.4
---

d03e47c4053205460c282a246f944c09d0d600a9