From: Michael Foord <michael@python.org>
Date: Mon, 14 Mar 2011 23:03:30 +0000 (-0400)
Subject: merge default
X-Git-Tag: v3.3.0a1~2921^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee354eabc996ed532bcd648e628d367468b6c00c;p=thirdparty%2FPython%2Fcpython.git

merge default
---

ee354eabc996ed532bcd648e628d367468b6c00c