From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Tue, 14 Aug 2012 15:42:10 +0000 (+0300)
Subject: Merge 3.2 to default
X-Git-Tag: v3.3.0rc1~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c53eb9dfe226ba4db2d792f7c7bd8642dff1ad82;p=python

Merge 3.2 to default
---

c53eb9dfe226ba4db2d792f7c7bd8642dff1ad82