# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-08-12 23:09:03
# Node ID 7fa36341e7a01a637f397673a11d09241cda8c7a
# Parent  00fee6394daf3cafe8a7f4cc348afe0b9d9b8e6c
# Parent  9232488985dc44623d4ce4e5692d0bf36f9786ab

merge with stable