From: Georg Brandl <georg@python.org>
Date: Tue, 8 Oct 2013 06:06:27 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~213
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=245c765d0a73e385ff00a982d2c60d0a96c94c74;p=python

merge with 3.3
---

245c765d0a73e385ff00a982d2c60d0a96c94c74