Tue, 30 Jun 2009 03:03:46 -0700 merged upstream
james@jamess-macbook-air.local [Tue, 30 Jun 2009 03:03:46 -0700] rev 2458
merged upstream
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip