From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 15 Nov 2011 14:26:32 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~841
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2495c6af3baad44a85d2ec9b9aacae2cbad158c0;p=thirdparty%2FPython%2Fcpython.git

Merge
---

2495c6af3baad44a85d2ec9b9aacae2cbad158c0