From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 16 Jun 2011 23:51:42 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac05945346723b96bbe3c5c4bb6e7905aa64b1fd;p=python

merge heads
---

ac05945346723b96bbe3c5c4bb6e7905aa64b1fd