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

merge with 3.3
---

ebe32247472e2361236ee6c70c2bcc5461703efa