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

merge with 3.3
---

38552a66611d24a32dd7cdbe56e7a911606e1c8b