# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1259079911 21600
# Node ID e84066a49e3a644bfa7cc989557869e1c5295a39
# Parent  04148e7915ac82a90679399f86f371b6bf63d87b# Parent  b22ff29a3fbb1c1841c1c5b62f510c5ca2c782c3
Merge with stable