From: Stefan Krah <skrah@bytereef.org>
Date: Thu, 8 Dec 2011 21:30:18 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.3.0a1~662
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ac5fac2680110d079cbefdcca34adf594e24c73;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

2ac5fac2680110d079cbefdcca34adf594e24c73