From: Éric Araujo <merwok@netwok.org>
Date: Thu, 26 May 2011 14:52:22 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v2.7.2rc1~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fcda6829a457616d323d1282a3c434af20224c5;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

8fcda6829a457616d323d1282a3c434af20224c5