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

merge with 3.3.
---

2a09b6e84955779dbc878c5a0679c41d84f5d021