From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 10 Feb 2014 17:27:06 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v2.7.7rc1~185
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0b7ac55560b80eecc8b55706cb4cfe201763fdb;p=python

Merge heads
---

d0b7ac55560b80eecc8b55706cb4cfe201763fdb