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

merge with 3.3
---

9e80124ca296165d42981353aaeec15569cf4f7c