From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 6 Mar 2012 12:45:57 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0a2~276^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d627980d547088b52eb447f4e7a8ab7292fa4af;p=thirdparty%2FPython%2Fcpython.git

Merge
---

2d627980d547088b52eb447f4e7a8ab7292fa4af