From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Sat, 29 Dec 2012 21:11:20 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.4.0a1~1741
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9edccb47db7683031e76f02e659e637cf04ba2d7;p=python

merge heads
---

9edccb47db7683031e76f02e659e637cf04ba2d7