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

merge with 3.3
---

736295c347f662b5af612326ed04dea75b0894bb