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

merge with 3.3
---

4a6ca2186a8f487831d3c5d14f7d037a614a77d2