From: Georg Brandl <georg@python.org>
Date: Sun, 14 Apr 2013 09:16:46 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~940
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f36f20f850c10e8828ada85507680eb6529ef920;p=python

merge with 3.3
---

f36f20f850c10e8828ada85507680eb6529ef920