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

merge 3.4 (#21135)
---

2995f8a7985519687a8535af35c5a895a69c83ef