From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 2 Apr 2014 16:05:41 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1962
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f93c27eb53cd6ff3c6e7e5e8528a7e876cb6213e;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

f93c27eb53cd6ff3c6e7e5e8528a7e876cb6213e