From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 1 Jun 2011 00:08:12 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v2.7.3rc1~711
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdc21fbaf9dd32b5c140e5ee78575d5465379467;p=python

merge heads
---

bdc21fbaf9dd32b5c140e5ee78575d5465379467