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

Merged changes.
---

c1a9d30354ba2d8ce8268ca75a347785703ff228