From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 27 Jun 2011 14:16:23 +0000 (-0500)
Subject: merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a5d599b3663e20fafd7f710d6e8e794701d7842;p=python

merge heads
---

4a5d599b3663e20fafd7f710d6e8e794701d7842