From: Éric Araujo <merwok@netwok.org>
Date: Tue, 3 Jul 2012 05:13:40 +0000 (-0400)
Subject: Branch merge
X-Git-Tag: v2.7.4rc1~721
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e06e37be0afb8503da29c72b19179e3da25fb87;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

9e06e37be0afb8503da29c72b19179e3da25fb87