From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 11 Oct 2011 17:54:03 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0a1~1228
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60dd7dc23c37bbb1c6ecc83a866f1a379afce443;p=thirdparty%2FPython%2Fcpython.git

Merge
---

60dd7dc23c37bbb1c6ecc83a866f1a379afce443