From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 23 Aug 2011 17:49:13 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.2.3rc1~621
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a084105a0ebd0b309ef9b036e9d7922d6c0c555;p=thirdparty%2FPython%2Fcpython.git

Merge
---

7a084105a0ebd0b309ef9b036e9d7922d6c0c555