]> granicus.if.org Git - python/commitdiff
merge
authorBrett Cannon <brett@python.org>
Tue, 6 Mar 2012 20:33:24 +0000 (15:33 -0500)
committerBrett Cannon <brett@python.org>
Tue, 6 Mar 2012 20:33:24 +0000 (15:33 -0500)

Trivial merge