From: Skip Montanaro <skip@pobox.com>
Date: Sat, 19 Mar 2011 18:03:33 +0000 (-0500)
Subject: merge from upstream
X-Git-Tag: v3.3.0a1~2890
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=482e7e061b110d4c2a5b8d39d13444370baf112b;p=thirdparty%2FPython%2Fcpython.git

merge from upstream
---

482e7e061b110d4c2a5b8d39d13444370baf112b