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

merge with 3.3
---

7fe16b36abd3f0ef5fa968a8deadba0a5cf794f2