From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 23 Nov 2013 17:08:38 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.4.0b1~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=434d27a4906a8567a4b1c8d73128038dc788fd6b;p=python

Merge heads
---

434d27a4906a8567a4b1c8d73128038dc788fd6b