From: Georg Brandl <georg@python.org>
Date: Mon, 6 Oct 2014 14:19:20 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~742
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f8fed28f020cd1a4d3471514fa40629e440e5e3;p=python

merge with 3.4
---

4f8fed28f020cd1a4d3471514fa40629e440e5e3