# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090627023225-t35wfz9nsda35ame
# target_branch: file:///home/daogangq/mysql/bzrwork/bug45214/5.1-bt/
# testament_sha1: 314bc0d7091b26dc84ed77172332b7ba88c24146
# timestamp: 2009-06-27 10:32:41 +0800
# base_revision_id: davi.arnaut@sun.com-20090612211119-\
#   jrxxjz0fx90hj9lv
# 
# Begin bundle
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
cQA=



