From: Stefan Krah <skrah@bytereef.org>
Date: Wed, 16 Jan 2013 22:25:41 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1590
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31efb380b319c90726b2dbad486fc1f869336953;p=python

Merge 3.3.
---

31efb380b319c90726b2dbad486fc1f869336953