From: Georg Brandl <georg@python.org>
Date: Tue, 2 Oct 2012 08:16:26 +0000 (+0200)
Subject: merge with 3.3.
X-Git-Tag: v3.4.0a1~2408
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=450dbcf4219acf231f60886a924a1e28dfb8ceef;p=python

merge with 3.3.
---

450dbcf4219acf231f60886a924a1e28dfb8ceef