Thu, 05 Jul 2007 14:32:18 -0700 Merge with main
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 14:32:18 -0700] rev 4823
Merge with main
(0) -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip