From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 26 Apr 2014 20:57:11 +0000 (-0400)
Subject: merge 3.4 (#19385)
X-Git-Tag: v3.5.0a1~1791
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4453cf576a18bc98131b7117691a8ea311b348cd;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#19385)
---

4453cf576a18bc98131b7117691a8ea311b348cd