From: Georg Brandl <georg@python.org>
Date: Sun, 30 Sep 2012 16:14:10 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~2440
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e564026947c21cfc6ab1ba76bd12d611e2c19993;p=python

merge with 3.3
---

e564026947c21cfc6ab1ba76bd12d611e2c19993