From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Sun, 28 Oct 2012 12:12:50 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.3.1rc1~729^2~1^2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21b102481bd1b261fe6a5351fc959a6a978a094f;p=python

merge heads
---

21b102481bd1b261fe6a5351fc959a6a978a094f