From: Georg Brandl <georg@python.org>
Date: Mon, 25 Mar 2013 06:01:37 +0000 (+0100)
Subject: merge with upstream 3.3 branch
X-Git-Tag: v3.3.1rc1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a809e4a54007303efb084b85ba53605adaa41b64;p=python

merge with upstream 3.3 branch
---

a809e4a54007303efb084b85ba53605adaa41b64