From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 12 Sep 2012 16:02:18 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.1rc1~818^2^2~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77c45538f79a1b0110e088d256a222d68563354d;p=thirdparty%2FPython%2Fcpython.git

Merge
---

77c45538f79a1b0110e088d256a222d68563354d