# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1367514941 18000
# Node ID 55154cea5550cfaac0ab2cd70bfbdc7438974c0a
# Parent  2cad301a7f06f69fed30758a8068bd676d236da9# Parent  762208a3edabc483936fff7ef4c8e02b25a8fba0
merge with stable