From: Georg Brandl <georg@python.org>
Date: Sun, 6 Oct 2013 10:42:40 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~245
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92666d9c2b97381aa3d700a4b41291be348c3d33;p=python

merge with 3.3
---

92666d9c2b97381aa3d700a4b41291be348c3d33