From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 1 Oct 2012 21:30:32 +0000 (+0200)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~2416^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca1232f7db5bf65d56af05245d39e9b3d2b9ebb8;p=python

Merge 3.3.
---

ca1232f7db5bf65d56af05245d39e9b3d2b9ebb8