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

Merge
---

a8201f02dcb67a5fb2a2bba8237c620951ec13e5