From: Brett Cannon <brett@python.org>
Date: Tue, 15 Mar 2011 20:03:32 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0a1~2905
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71f1363c349c6ccab38870d328cee4de9081c8f9;p=thirdparty%2FPython%2Fcpython.git

merge
---

71f1363c349c6ccab38870d328cee4de9081c8f9