From: Collin Winter <collinw@gmail.com>
Date: Wed, 17 Mar 2010 02:51:00 +0000 (+0000)
Subject: Commit missing merge info from r79014.
X-Git-Tag: v3.2a1~1445
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2bebd8fc503829d073cdf66ce998e55346719991;p=thirdparty%2FPython%2Fcpython.git

Commit missing merge info from r79014.
---