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

merge heads
---

ffd1f483063834531b6105b6ba0b71e482a8d555