From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 30 May 2014 18:05:02 +0000 (+0100)
Subject: Merged upstream changes.
X-Git-Tag: v2.7.8~37^2~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d5a05faac17ba4304375f2ef06bec939b93b431;p=python

Merged upstream changes.
---

9d5a05faac17ba4304375f2ef06bec939b93b431