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

Merge 3.3.
---

e65676b19439422cb3df5d87d276f0a254f8b9e7