From: Éric Araujo <merwok@netwok.org>
Date: Mon, 6 Jun 2011 15:11:47 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.2.1rc2~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b52f957977f450613c6eafdc9216ae7993d4d49;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

5b52f957977f450613c6eafdc9216ae7993d4d49