# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2011-04-05 21:11:40
# Node ID e4ffb9576b63b1ec90ec740a210d0c1f369e677a
# Parent  1aea86673deee9f382347377e398fbfc62c508ea
# Parent  14c0988c314d439206f39850af855bfb8bf2d7bd

merge with stable