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

merge with 3.3
---

ef1605afa8b55069c39bb3394cc6ee2b3f88a987