From: Georg Brandl <georg@python.org>
Date: Sat, 25 Aug 2012 19:33:56 +0000 (+0200)
Subject: Merge in changes from 3.3.0 release clone.
X-Git-Tag: v3.3.1rc1~818^2^2~184
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04427a077f7d4dfec0e8f8371aecabf9ded7c27c;p=python

Merge in changes from 3.3.0 release clone.
---

04427a077f7d4dfec0e8f8371aecabf9ded7c27c