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

merge with 3.3
---

1cb28a1be879ee0df29dc9072ed3b1fdc14428fd