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

merge with 3.3
---

1e6a3a2fe9c6402dc7c8c11dcbf1371beb73e05a