# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1243151763 18000
# Node ID accb1cf85c317322c50e2291430e98b26374d0ff
# Parent  4429751f5da7b8ea41973d1c81badb11ad32d890# Parent  107af208ed0be0bdb89ce2946052b0798b6e83d4
Merge with -stable