From: Georg Brandl <georg@python.org>
Date: Wed, 29 Oct 2014 08:00:37 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~585
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e67d801bdef7c43e6704200770fb9cf2040dc11;p=python

merge with 3.4
---

9e67d801bdef7c43e6704200770fb9cf2040dc11