From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Wed, 17 Oct 2012 14:33:26 +0000 (+0300)
Subject: merge heads
X-Git-Tag: v3.4.0a1~2230^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e9af84e2ef41115dd07d00b57e5a2a7041bfeed;p=python

merge heads
---

1e9af84e2ef41115dd07d00b57e5a2a7041bfeed