# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@sun.com-20091204095602-lenujajxztn6gu38
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/semisync\
#   /b49020/6.0-codebase-bugfixing/
# testament_sha1: 16365bcbc19001b0817b3bd4ada105657b0e4376
# timestamp: 2009-12-04 17:57:23 +0800
# source_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/semisync\
#   /b49020/trunk-bugfixing/
# base_revision_id: alik@sun.com-20091203092413-5tsz2k3tqtev6965
# 
# Begin bundle
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
oSDVZefi



