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

merge with 3.3
---

fb0b2550229854b155136ccb3f9cffe5841277bb