From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 23 Nov 2012 19:22:39 +0000 (+0000)
Subject: Merged upstream changes.
X-Git-Tag: v3.4.0a1~1954
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8eb15dce2228eacfe44d908d77b6518c72196e9;p=python

Merged upstream changes.
---

f8eb15dce2228eacfe44d908d77b6518c72196e9