From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 5 Sep 2013 14:32:15 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.4.0a2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d46b0be2af5ae7ee8720f29b7e50277a24d22b2;p=python

Merge heads
---

3d46b0be2af5ae7ee8720f29b7e50277a24d22b2