From: Éric Araujo <merwok@netwok.org>
Date: Mon, 8 Aug 2011 14:56:17 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~1735^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c3f648c0c350b2c7c4dfa3734cdb00e68ff8a6d;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

5c3f648c0c350b2c7c4dfa3734cdb00e68ff8a6d