# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090707102855-h0f97xum8ofzlwwk
# target_branch: file:///home/daogangq/mysql/bzrwork/bug45214/5.1-bt/
# testament_sha1: 36d3153d30e745559bb537ed6ba248cf6ebf839a
# timestamp: 2009-07-07 18:29:16 +0800
# base_revision_id: davi.arnaut@sun.com-20090612211119-\
#   jrxxjz0fx90hj9lv
# 
# Begin bundle
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
EQiCc3JoiAhv/i7kinChIDSIGyY=



