From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 25 Mar 2011 21:58:31 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v2.7.2rc1~219
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d480d93f61365ab08fc4910c8886fb91b6937cfc;p=python

merge heads
---

d480d93f61365ab08fc4910c8886fb91b6937cfc