From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 15 Mar 2011 20:10:33 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~2903^2~2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8213cafd62a70881d38f9f8e88097b5af4bf998d;p=thirdparty%2FPython%2Fcpython.git

Merge
---

8213cafd62a70881d38f9f8e88097b5af4bf998d