From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 13 Mar 2012 12:18:19 +0000 (+0000)
Subject: Merged upstream change.
X-Git-Tag: v3.3.0a2~221^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69437da15fb4f626290af0d60bf8d90c5869b828;p=thirdparty%2FPython%2Fcpython.git

Merged upstream change.
---

69437da15fb4f626290af0d60bf8d90c5869b828