# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2011-04-06 20:14:51
# Node ID fab10e7cacd6a0413869cff4b418403504ba2ec9
# Parent  e4ffb9576b63b1ec90ec740a210d0c1f369e677a
# Parent  d3890ead75be2a9752ed2be3eee1b050ece0746a

merge with stable