]> granicus.if.org Git - python/commitdiff
merge
authorBrett Cannon <brett@python.org>
Fri, 11 Mar 2011 22:46:21 +0000 (17:46 -0500)
committerBrett Cannon <brett@python.org>
Fri, 11 Mar 2011 22:46:21 +0000 (17:46 -0500)

Trivial merge