]> granicus.if.org Git - python/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Thu, 23 Feb 2012 15:17:56 +0000 (10:17 -0500)
committerBrett Cannon <brett@python.org>
Thu, 23 Feb 2012 15:17:56 +0000 (10:17 -0500)

Trivial merge