From: Éric Araujo <merwok@netwok.org>
Date: Mon, 1 Aug 2011 12:48:19 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v2.7.3rc1~548
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0db7f72cc74baeefaab647cd8f627a0d31becf16;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

0db7f72cc74baeefaab647cd8f627a0d31becf16