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

Merge 3.3.
---

16dd5245ac28e9e681dbb9930623c53a2fb37fb7