From: Georg Brandl <georg@python.org>
Date: Sun, 12 May 2013 17:57:26 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~738
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bfc5f5d833f081089e181cadf52d4ec50e62d13;p=python

merge with 3.3
---

3bfc5f5d833f081089e181cadf52d4ec50e62d13