From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sun, 28 Oct 2012 12:41:44 +0000 (+0000)
Subject: Merged upstream changes.
X-Git-Tag: v3.3.1rc1~729^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=484adb509ee78b7e9a0b0374235bb4bf0a3e3aa9;p=python

Merged upstream changes.
---

484adb509ee78b7e9a0b0374235bb4bf0a3e3aa9