# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1260895524 21600
# Node ID 649bb75b538648a19f639f1d83b420b3b53505cb
# Parent  4c632e242e2a78d44146f0458a7a40c5be6ee501# Parent  ad5ef62b5a983d934af5872f8d841366ab641122
Merge with stable