From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 23 Feb 2012 20:20:08 +0000 (-0500)
Subject: merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03d23687480c77130e7fc28f323ec75413e6f060;p=python

merge heads
---

03d23687480c77130e7fc28f323ec75413e6f060