Tue, 30 Mar 2010 18:47:38 +0100 merge from fix
Jon Chatten [Tue, 30 Mar 2010 18:47:38 +0100] rev 422
merge from fix
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 tip