From: Stefan Krah <skrah@bytereef.org>
Date: Fri, 28 Sep 2012 14:21:17 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.1rc1~818^2^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5dc6e50ffc453bf6e8c49634d9dace88d73351c;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

d5dc6e50ffc453bf6e8c49634d9dace88d73351c