From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 12 Jul 2013 20:19:41 +0000 (+0100)
Subject: Merged upstream changes.
X-Git-Tag: v3.4.0a1~227^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c7dde3bd9f502247a6722baefda81afc5ba3ffc;p=python

Merged upstream changes.
---

8c7dde3bd9f502247a6722baefda81afc5ba3ffc