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

merge 3.4 (#21115)
---

1b90f8e0e9b02c51a0d7b4ee19bf7d9d696975bc