Merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 29 Dec 2009 16:16:25 -0600
changeset 10158 08c90cb58b04
parent 10157 5d92fe90be84
child 10159 182416227722
Merge with stable