# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1240336704 18000
# Node ID 9269b66fc7e77542e0e043ebd39937af3dad4957
# Parent  2a4a71b15e954ee91f27d89d08d42a90b8c67508# Parent  0019be957555b5b7de2a12316fc805169ffade1f
Merge with stable