From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sun, 28 Oct 2012 12:41:21 +0000 (+0000)
Subject: Merged upstream changes.
X-Git-Tag: v3.4.0a1~2150^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13e78374890281967adfd70472a6324bc6b3e266;p=python

Merged upstream changes.
---

13e78374890281967adfd70472a6324bc6b3e266