From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 15 Jul 2011 19:19:02 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.2.2rc1~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8298a01e6fefec9b0b64fd6915e57fc246b9a55;p=thirdparty%2FPython%2Fcpython.git

Merge
---

b8298a01e6fefec9b0b64fd6915e57fc246b9a55