From: Eric Smith <eric@trueblade.com>
Date: Tue, 23 Feb 2010 02:03:57 +0000 (+0000)
Subject: Rerecorded the merge of r78340, which got accidentally deleted in an svnmerge problem... 
X-Git-Tag: v3.1.2rc1~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7dfc396382d3f1bef917e0e4a6b170b11c75b13;p=python

Rerecorded the merge of r78340, which got accidentally deleted in an svnmerge problem while checking in r78352.
---