From: Georg Brandl <georg@python.org>
Date: Sat, 29 Sep 2012 07:27:15 +0000 (+0200)
Subject: Merge with main repo default branch.
X-Git-Tag: v3.3.1rc1~818^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99a247fd01c1cd780c0c3ee1116657627f1ee744;p=python

Merge with main repo default branch.
---

99a247fd01c1cd780c0c3ee1116657627f1ee744