From: Georg Brandl <georg@python.org>
Date: Sun, 6 Oct 2013 08:28:48 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~257
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6930777c63899e25ad5bb1033da8294f7aaedd4e;p=python

merge with 3.3
---

6930777c63899e25ad5bb1033da8294f7aaedd4e