From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 23 May 2011 21:30:29 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2183^2~141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfcdcf928225f6e34036a0f768c34dcc4814c860;p=python

merge heads
---

bfcdcf928225f6e34036a0f768c34dcc4814c860