From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 3 Feb 2014 18:42:43 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v2.7.8~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da0dbc004ca9867db7dc470765505ebb09b949b0;p=python

Merge heads
---

da0dbc004ca9867db7dc470765505ebb09b949b0