From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 31 May 2014 20:17:15 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1557
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da30b46e571d0e8f4ca6a7205b6f202de67f0c02;p=python

merge 3.4
---

da30b46e571d0e8f4ca6a7205b6f202de67f0c02