From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 15 Jul 2011 19:19:27 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0a1~1894^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91fe8157fd3518fcf7c2f7cd7bd247131e8e839f;p=thirdparty%2FPython%2Fcpython.git

Merge
---

91fe8157fd3518fcf7c2f7cd7bd247131e8e839f