From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Thu, 9 Aug 2012 12:27:45 +0000 (+0300)
Subject: merge heads
X-Git-Tag: v3.3.0b2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ee02670b8cca041eb0bee331d243325dd83331d;p=python

merge heads
---

1ee02670b8cca041eb0bee331d243325dd83331d