From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Thu, 5 May 2011 11:59:59 +0000 (+0100)
Subject: Merged changes.
X-Git-Tag: v3.3.0a1~2402
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c9f8c7e4c24dfb0d1fe335ca4477393085a4628;p=thirdparty%2FPython%2Fcpython.git

Merged changes.
---

6c9f8c7e4c24dfb0d1fe335ca4477393085a4628