From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 17 Jun 2014 06:08:29 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1443^2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7258e6da3bc7e7c6bc47b6cf6f40f32849006db7;p=python

merge 3.4
---

7258e6da3bc7e7c6bc47b6cf6f40f32849006db7