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

merge 3.4
---

450c1586c022391fb9e4925240c322f76aa6a68f