# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1299077643 -3600
# Node ID 7cff07b61d1300ebb08167f41d88d8ce7035512c
# Parent  83f4abc7568f9004aa5080ba569b29ffd311f4ec# Parent  3dd37cc8d8b353b2af5b3414d3e2269e7379ecf1
Merge with 3dd37cc8d8b353b2af5b3414d3e2269e7379ecf1