From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Wed, 15 Aug 2012 19:53:56 +0000 (+0300)
Subject: merge heads
X-Git-Tag: v3.3.0rc1~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9351117139363f3e600c541bc88139702a055db8;p=python

merge heads
---

9351117139363f3e600c541bc88139702a055db8