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

merge with 3.3
---

449709272f42c6098a487c726c99bb5d06806954