From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 17 Mar 2014 21:00:27 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~2101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e380e0986bcec1eff78655d559774d71417b799d;p=python

merge 3.4
---

e380e0986bcec1eff78655d559774d71417b799d