From: Georg Brandl <georg@python.org>
Date: Sun, 3 Feb 2013 10:48:44 +0000 (+0100)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~1460
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecfb963148525c110006e80dd1f4b316b6b8bcc0;p=python

merge with 3.3
---

ecfb963148525c110006e80dd1f4b316b6b8bcc0