From: Georg Brandl <georg@python.org>
Date: Sun, 6 Oct 2013 16:58:03 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~227
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=434bdf413ff78fe23127da23f267dd0e18d633e8;p=python

merge with 3.3
---

434bdf413ff78fe23127da23f267dd0e18d633e8