From: Georg Brandl <georg@python.org>
Date: Tue, 25 Mar 2014 09:13:44 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~2027
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b50f8c9c0d20bb6213401f786059c5c91a15c3ec;p=python

merge with 3.4
---

b50f8c9c0d20bb6213401f786059c5c91a15c3ec