From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Wed, 5 Dec 2012 09:12:50 +0000 (+0200)
Subject: Merge 3.3
X-Git-Tag: v3.4.0a1~1902
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1715ea435427ac9058326715a686caa08823378;p=python

Merge 3.3
---

b1715ea435427ac9058326715a686caa08823378