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

Merge heads
---

ca1d6db6d3066465a06505f5048610dc7a3c9300