From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 25 Jun 2012 16:09:07 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0b1~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e5f371210d91442ec67073bb4dfc52d46e51ef8;p=thirdparty%2FPython%2Fcpython.git

Merge
---

2e5f371210d91442ec67073bb4dfc52d46e51ef8