From: Éric Araujo <aeric@mtlpy.org>
Date: Sun, 9 Dec 2012 03:45:09 +0000 (-0500)
Subject: Branch merge
X-Git-Tag: v2.7.4rc1~317
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=367efc254ddd6b1e40c36d702bc727b9c26dcdcb;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

367efc254ddd6b1e40c36d702bc727b9c26dcdcb