Merge with stable
authorMatt Mackall <mpm@selenic.com>
Wed, 13 Aug 2008 20:18:40 -0500
changeset 6886 41aaaa23745f
parent 6885 6e253aa04ff7
child 6887 304484c7e0ba
Merge with stable