From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 5 Nov 2013 19:08:04 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v2.7.8~290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0db03be9c81bc1861b26d5b720b8bd1bfa995d70;p=python

Merge heads
---

0db03be9c81bc1861b26d5b720b8bd1bfa995d70