From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Fri, 20 Jul 2012 11:55:20 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.3.0b2~154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=674d6a6972d7e49e64f3a94abd551a2445617227;p=python

Merge heads
---

674d6a6972d7e49e64f3a94abd551a2445617227