]> granicus.if.org Git - python/commitdiff
Merge #11496 from 3.2.
authorR David Murray <rdmurray@bitdance.com>
Mon, 14 Mar 2011 21:14:29 +0000 (17:14 -0400)
committerR David Murray <rdmurray@bitdance.com>
Mon, 14 Mar 2011 21:14:29 +0000 (17:14 -0400)

Trivial merge