From: Petri Lehtinen <petri@digip.org>
Date: Mon, 24 Oct 2011 18:29:20 +0000 (+0300)
Subject: merge heads
X-Git-Tag: v2.7.3rc1~381
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99e93d2ddeb195800e0d2b447bad0ee477a5d135;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

99e93d2ddeb195800e0d2b447bad0ee477a5d135