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

merge with 3.3
---

6231e529400f3c4ad62262b40f0229535170ac3b