From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 7 May 2011 17:45:34 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.2.1b1~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d1cd0a0a03838422805c93f680d3232673ccd00;p=thirdparty%2FPython%2Fcpython.git

Merge
---

4d1cd0a0a03838422805c93f680d3232673ccd00