From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Sun, 7 Oct 2012 16:21:24 +0000 (+0300)
Subject: merge heads
X-Git-Tag: v3.4.0a1~2309^2~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=226666667414da863207a8db974fb42ffa018a4e;p=python

merge heads
---

226666667414da863207a8db974fb42ffa018a4e