# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1308688004 18000
# Node ID 640bfe96ddcfdf5e168b580349f31176481b87aa
# Parent  0e64286760d5214d9046d1597a988e5bd1a05b52# Parent  6c7283faa967741009f8223b04b1098ada8ec552
merge with stable