# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2011-04-07 20:08:15
# Node ID d3f90ff904b80519ee432241d359d34d75af5475
# Parent  6bc340940c1838dcf8b8d26d5b36e70dc26e1e1f
# Parent  71ea5b2b95173570d39a75a0229725dfac2f0ab7

merge with stable