# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1188785963 0
# Node ID d4fb44035799b521494cbe4be11a60674a9ee556
# Parent  1cba50791c36f0b39bc9895aa06f555e1753cfa7# Parent  4e147af6a033fdce48ee7403c8a4db009a43bc1f
merge of '1bc4d7f1a38917e6d2bf837a660f5f498a29ea0c'
     and 'dd0060c3e748fd6d877ca32879c785c9bdb434fc'