From: R David Murray <rdmurray@bitdance.com>
Date: Mon, 14 Mar 2011 02:40:59 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v2.7.2rc1~257
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c76c5301905ed34620918dd7ee95da63bdc9cf3;p=python

merge heads
---

8c76c5301905ed34620918dd7ee95da63bdc9cf3