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

merge 3.4
---

2ce54c2912ba4c1cb7278f319d455a01db70db4f