From: Georg Brandl <georg@python.org>
Date: Sat, 12 Oct 2013 18:01:14 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c11e52f7e17de5ffd8a0b745bd20c32141bdf33;p=python

merge with 3.3
---

7c11e52f7e17de5ffd8a0b745bd20c32141bdf33