]> granicus.if.org Git - python/commitdiff
merge
authorBrett Cannon <brett@python.org>
Thu, 23 Feb 2012 23:30:04 +0000 (18:30 -0500)
committerBrett Cannon <brett@python.org>
Thu, 23 Feb 2012 23:30:04 +0000 (18:30 -0500)

Trivial merge