From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Fri, 13 Apr 2012 00:32:51 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v2.7.4rc1~907
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4b2f9879cbd2f748bc1b729629c3a9ec6aa2e74;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

a4b2f9879cbd2f748bc1b729629c3a9ec6aa2e74