From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 18 Jan 2012 01:05:38 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~364
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e39ebe45c4953ff506a1f7bd5c115b5c1b8e66d7;p=thirdparty%2FPython%2Fcpython.git

Merge
---

e39ebe45c4953ff506a1f7bd5c115b5c1b8e66d7