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

merge 3.4
---

e6bfdb9ca592382fc0a2f976dcf6d290f364220d