# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1308104875 14400
# Node ID f1808d07caa01a84acc6c67cd6207426d1637e1c
# Parent  47bf5a91934df27ebc1ac044e26376d7031e0d3e# Parent  c40bb62b5c77722cdf9b6983593ff1053e70e6c5
Merge.

diff -r 47bf5a91934d -r f1808d07caa0 .hgsub
diff -r 47bf5a91934d -r f1808d07caa0 .hgsubstate