From: Georg Brandl <georg@python.org>
Date: Mon, 1 Oct 2012 17:38:41 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~2420
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3d6538c126fc050f2ebcac9e61b5849652cd04b;p=python

merge with 3.3
---

a3d6538c126fc050f2ebcac9e61b5849652cd04b