From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 2 May 2011 12:18:21 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.3.0a1~2435
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2265cf4c2ec926ebb4147261dca00d1f5a3a9e2a;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

2265cf4c2ec926ebb4147261dca00d1f5a3a9e2a