# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1308695240 18000
# Node ID 8deebb5777511369a852e5cb42e69844c40ebf7a
# Parent  640bfe96ddcfdf5e168b580349f31176481b87aa# Parent  88a53081fb2167536c19db10bc5d5e15d6b589a0
merge with stable