From: Georg Brandl <georg@python.org>
Date: Fri, 19 Oct 2012 05:37:56 +0000 (+0200)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~2224
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=edbe30c7c7131a121c9d8a5652e1c63cdae11f1b;p=python

Merge with 3.3
---

edbe30c7c7131a121c9d8a5652e1c63cdae11f1b