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

Merge
---

765dcdede824c41011228461e4a5fdaec6fc90d2