# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1218676720 18000
# Node ID 41aaaa23745f4ef89068bea848c4c3efb69e9787
# Parent  6e253aa04ff7cf974fc3719dc8ae8136fcf693f5
Merge with stable