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

merge with 3.3
---

e827ea866d811fd58aa5aec0786e76e18217c368