# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@sun.com-20090926104326-66w9wsp1a9le6amz
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/semisync\
#   /6.0-codebase-bugfixing/
# testament_sha1: 7db6ee874ef268d6f56e812ec69c7d7854c9b254
# timestamp: 2009-09-26 18:44:06 +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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
LLAoljq4lDe/in/F3JFOFCQNy3BBgA==



