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

Merge
---

b89600137712bf5a607404ea0aefbb10de31efc5