From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 4 Apr 2014 17:59:46 +0000 (-0400)
Subject: merge 3.4 (#21128)
X-Git-Tag: v3.5.0a1~1946
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3253fb1cb313e0e997fd75c0450d0c879b3a4772;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#21128)
---

3253fb1cb313e0e997fd75c0450d0c879b3a4772