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

Merge
---

d9488c68416696de400dd98d69c57cb9acb14c5a