From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 20 Dec 2011 13:00:12 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~549
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1743db5c1066afe1a32c9840aa1f8f376a80ef5a;p=thirdparty%2FPython%2Fcpython.git

Merge
---

1743db5c1066afe1a32c9840aa1f8f376a80ef5a