From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 2 Apr 2012 18:59:15 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.0a3~328^2^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ee2a8a127b99e3f7f1cd4ab17a93b240ab56661;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

4ee2a8a127b99e3f7f1cd4ab17a93b240ab56661