# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1308321698 14400
# Node ID 7eae993ccc657289bf4fe62a995778643285c2d7
# Parent  e93c240fe42c32ed916ddc6d1f1097f39a53a850# Parent  f1808d07caa01a84acc6c67cd6207426d1637e1c
Merge.

diff -r e93c240fe42c -r 7eae993ccc65 .hgsub
diff -r e93c240fe42c -r 7eae993ccc65 .hgsubstate