From: Stefan Krah <skrah@bytereef.org>
Date: Sun, 30 Sep 2012 15:17:36 +0000 (+0200)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~2443
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e04d611548ce49dfea37122d564aa312d1eb0473;p=python

Merge 3.3.
---

e04d611548ce49dfea37122d564aa312d1eb0473