From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 20 Mar 2014 17:40:03 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~2069^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8efe3df6642a1d29c6e8bafe18c038ed64b398c3;p=python

merge 3.4
---

8efe3df6642a1d29c6e8bafe18c038ed64b398c3