Mon, 01 Feb 2010 11:34:44 -0600 Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 01 Feb 2010 11:34:44 -0600] rev 10312
Merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip