# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1320184170 18000
# Node ID f437967f9f8037bb990e0818c86ebef1d5d8d433
# Parent  872f06c342ffa01f414cb57506090faaff410cd4# Parent  a708b65baeb92ce4971cccaee5b799b88595ddb2
merge with stable, reopen default branch