# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1324325073 21600
# Node ID 54f2205d8ea936d7e7c980cbe4f1351d4abad974
# Parent  65d1c54ca705e1a073ad10e8c4e2f545adb554a7# Parent  7722593fef5c54b778f0483f93743ee91db7d340
merge with stable