From: Georg Brandl <georg@python.org>
Date: Sat, 6 Oct 2012 11:50:27 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~2347^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ad4fb9732ae93e7aa7beb9684d7e3c10a95438f;p=python

merge with 3.3
---

4ad4fb9732ae93e7aa7beb9684d7e3c10a95438f