From: Georg Brandl <georg@python.org>
Date: Sun, 13 Oct 2013 08:49:47 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~136
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31f6f4dd03896aeba7f747119ee06187427b46b3;p=python

merge with 3.3
---

31f6f4dd03896aeba7f747119ee06187427b46b3