Merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 24 Nov 2009 10:25:11 -0600
changeset 9922 e84066a49e3a
parent 9920 04148e7915ac (current diff)
parent 9921 b22ff29a3fbb (diff)
child 9923 c0b79fdfd214
Merge with stable