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

merge 3.4
---

d5d4ef3f181510c1f485ea84e6f7f835790866e7