From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 18 Dec 2011 18:31:14 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a1~570
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83250bb0a80cd7b5f5024965d4a71790de8b25df;p=thirdparty%2FPython%2Fcpython.git

Merge
---

83250bb0a80cd7b5f5024965d4a71790de8b25df