From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 22 Jul 2011 22:21:56 +0000 (-0500)
Subject: merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9553ea8a523a7a86cd0bdd46638930200fbc150b;p=python

merge heads
---

9553ea8a523a7a86cd0bdd46638930200fbc150b