# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1254982668 18000
# Node ID 7e03423def3ca43706fb5a9a8951ba10cdb75ba0
# Parent  ceb0f59e1327adbac83bd5f2c1806a19456fd37d# Parent  7cea12e7012965bb7305a96a7e8e2b100468175a
merge with stable