From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 23 Mar 2013 11:01:36 +0000 (+0000)
Subject: Merged upstream changes.
X-Git-Tag: v3.4.0a1~1109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42fb352a987050eb042ca8b83d679752e02e1441;p=python

Merged upstream changes.
---

42fb352a987050eb042ca8b83d679752e02e1441