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

merge with 3.3.
---

a32e8dfe129143dddf77323bce44702980ee0421