From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 15 Mar 2011 20:21:03 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2903^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8af4919b37914e73ec547e4216b309705f2f5283;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

8af4919b37914e73ec547e4216b309705f2f5283