From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 16 Dec 2013 13:16:11 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v2.7.8~197
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d39df35d7d72e0796c221674f0d507c5df62f19;p=python

Merge heads
---

4d39df35d7d72e0796c221674f0d507c5df62f19