From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Sun, 1 Dec 2013 00:56:36 +0000 (-0800)
Subject: Merge heads.
X-Git-Tag: v2.7.8~226
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6df622c4cc9be85764ab55e9e0ac230fe487efb;p=python

Merge heads.
---

c6df622c4cc9be85764ab55e9e0ac230fe487efb