From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 12 May 2012 21:43:55 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0a4~195
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eafae028e0f7704ae64b3f51cea636c17587965e;p=thirdparty%2FPython%2Fcpython.git

Merge
---

eafae028e0f7704ae64b3f51cea636c17587965e