Wed, 11 Aug 2010 09:54:24 -0500 fix some merge glitches C3_BUILDER_WORK
timkelly [Wed, 11 Aug 2010 09:54:24 -0500] rev 1803
fix some merge glitches
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip