# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090701061604-p48ap4rob6jxbhjv
# target_branch: file:///home/daogangq/mysql/bzrwork/bug45214/5.1-bt/
# testament_sha1: 904621c475d4e8fa9f798114ea28bbd46645c6eb
# timestamp: 2009-07-01 14:16:23 +0800
# base_revision_id: davi.arnaut@sun.com-20090612211119-\
#   jrxxjz0fx90hj9lv
# 
# Begin bundle
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
BftDfQA=



