]> granicus.if.org Git - python/commitdiff
merge
authorBrett Cannon <brett@python.org>
Tue, 3 Apr 2012 00:34:20 +0000 (20:34 -0400)
committerBrett Cannon <brett@python.org>
Tue, 3 Apr 2012 00:34:20 +0000 (20:34 -0400)

Trivial merge