# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-05-31 17:34:47
# Node ID 258c98567aff13ea1fd4405ff74a3ff242ef6cf0
# Parent  a5922547b5cc0eb81ce8ccb3219ce43c035ae385
# Parent  ccb4057e19e6ea0c048d7d6e37f369396feea9eb

Merge with stable