From: Éric Araujo <merwok@netwok.org>
Date: Tue, 16 Aug 2011 17:13:58 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~1691^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e5222d5f87b5e34a1d039f86e5e71d89419cdc1;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

6e5222d5f87b5e34a1d039f86e5e71d89419cdc1