Fri, 16 Dec 2011 19:05:59 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 16 Dec 2011 19:05:59 -0600] rev 15674
merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip