# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1284671546 18000
# Node ID ca58f6475f1deca12da93b81b0ae43dc5319368e
# Parent  f2daa6ab514a6652bf0cc1d2171d14bda0b3b2e2# Parent  fe20536c09d48b9fd6ae61f9a44e03b423379141
merge with stable