]> granicus.if.org Git - python/commitdiff
Dummy merge from 2.6.
authorR David Murray <rdmurray@bitdance.com>
Thu, 31 Mar 2011 15:48:31 +0000 (11:48 -0400)
committerR David Murray <rdmurray@bitdance.com>
Thu, 31 Mar 2011 15:48:31 +0000 (11:48 -0400)

Trivial merge