From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 13 Oct 2013 15:11:11 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.4.0a4~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fa41f1d1eb01ec50fec3dcd7c09a3d9dde6f301;p=python

Merge heads
---

5fa41f1d1eb01ec50fec3dcd7c09a3d9dde6f301