From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 15 Mar 2011 20:08:34 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.2.1b1~290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=709ac7b0a21690d804ac454e106015026e1eaffc;p=python

merge heads
---

709ac7b0a21690d804ac454e106015026e1eaffc