From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 15 Jul 2011 19:10:59 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~1897
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a41d7d51d34bac1f6d429d75ff517d609c2ef8f;p=python

merge heads
---

1a41d7d51d34bac1f6d429d75ff517d609c2ef8f