From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 31 Mar 2014 17:50:45 +0000 (-0400)
Subject: merge 3.4 (#21115)
X-Git-Tag: v3.5.0a1~1977
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=934a2957ba1b56eb363933a26e2b26fa160130fe;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#21115)
---

934a2957ba1b56eb363933a26e2b26fa160130fe