Merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 15 Dec 2009 10:45:24 -0600
changeset 10076 649bb75b5386
parent 10075 4c632e242e2a (current diff)
parent 10074 ad5ef62b5a98 (diff)
child 10077 89617aacb495
Merge with stable