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

Merge 3.3.
---

cc0589dbb97111896f981a1546a74726f318d553