]> granicus.if.org Git - python/commitdiff
merge
authorBrett Cannon <brett@python.org>
Fri, 24 Feb 2012 01:48:13 +0000 (20:48 -0500)
committerBrett Cannon <brett@python.org>
Fri, 24 Feb 2012 01:48:13 +0000 (20:48 -0500)

Trivial merge