From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Sun, 23 Dec 2012 10:51:40 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.3.1rc1~495
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f347cf903c61fec0fbf2a5528ef9b88f76e8977d;p=python

merge heads
---

f347cf903c61fec0fbf2a5528ef9b88f76e8977d