From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 18 Dec 2011 18:31:31 +0000 (+0100)
Subject: Merge
X-Git-Tag: v2.7.3rc1~238
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b3b1189ce250872d402194e1a12c5315034d847;p=thirdparty%2FPython%2Fcpython.git

Merge
---

3b3b1189ce250872d402194e1a12c5315034d847