From: Georg Brandl <georg@python.org>
Date: Sun, 28 Oct 2012 07:09:31 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~2150^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=534ca2b8eac7437a5566eaf76c19efd02756b1be;p=python

merge with 3.3
---

534ca2b8eac7437a5566eaf76c19efd02756b1be