# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@sun.com-20090926134416-q90gghycq4swuo0d
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/semisync\
#   /6.0-codebase-bugfixing/
# testament_sha1: b08df8c3d908f209977ddc88bb038a4ccef0a3cf
# timestamp: 2009-09-26 21:44:57 +0800
# source_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b45848\
#   /next-bugfixing/
# base_revision_id: zhenxing.he@sun.com-20090926103700-\
#   uxigxwiberkz9jxb
# 
# Begin bundle
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



