From: Georg Brandl <georg@python.org>
Date: Sun, 6 Oct 2013 17:14:46 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~225
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3686db104c7f3cf03864df6951c6ad9011fb6ea3;p=python

merge with 3.3
---

3686db104c7f3cf03864df6951c6ad9011fb6ea3