From: Georg Brandl <georg@python.org>
Date: Sat, 14 Sep 2013 07:11:21 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a3~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c79413df5efc3e4e46135ff0ca0ddb601a2313c2;p=python

merge with 3.3
---

c79413df5efc3e4e46135ff0ca0ddb601a2313c2