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

merge with 3.4
---

0d046e2a21e7f5d9feab295fadb60b558bea5d95