From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 8 Mar 2011 04:52:41 +0000 (-0600)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2973
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=966ed31c72e47a871683e70cb34cd3a13e9bc906;p=python

merge heads
---

966ed31c72e47a871683e70cb34cd3a13e9bc906