From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 3 Jan 2012 21:49:56 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.2.3rc1~218
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f616af086701d799ec8c5d06b8ec0e6a3717766;p=thirdparty%2FPython%2Fcpython.git

Merge
---

4f616af086701d799ec8c5d06b8ec0e6a3717766