From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 16 Jan 2014 15:20:02 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.3.4rc1~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aea79dd2c622a9b2a52e0b511e48ca86e0df9134;p=python

Merge heads
---

aea79dd2c622a9b2a52e0b511e48ca86e0df9134