From: Reid Kleckner <reid@kleckner.net>
Date: Mon, 14 Mar 2011 23:34:13 +0000 (-0400)
Subject: Merge with hg.python.org.
X-Git-Tag: v3.3.0a1~2921
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9b3a1c49d584fddf47f0c3befc818fcb124cb96;p=thirdparty%2FPython%2Fcpython.git

Merge with hg.python.org.
---

a9b3a1c49d584fddf47f0c3befc818fcb124cb96