# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1323453013 28800
# Node ID 4dbcf382107c84322f54482f1c2160c6609f65e1
# Parent  2e573efbfd729f14eaa9423f08f90d1d9d65ebf0# Parent  dd3a6223c51f51daa0a3a931b1e890b9b515a82b
Merged some changes.

diff -r dd3a6223c51f -r 4dbcf382107c .hgsub
diff -r dd3a6223c51f -r 4dbcf382107c .hgsubstate