# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1318707050 18000
# Node ID 384082750f2c51dc917d85a7145748330fa6ef4d
# Parent  fccd350acf799f756e3e09166d02b22f1360336c# Parent  2889d4574726546fefd0c22a5cfd0c23bd311a6c
merge default into stable for 2.0 code freeze