# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090707031030-s9sw101b894btkt5
# target_branch: file:///home/daogangq/mysql/bzrwork/bug45214/5.1-bt/
# testament_sha1: 6559cf5cec7fac31009fabb1c37697346e6b9a60
# timestamp: 2009-07-07 11:10:48 +0800
# base_revision_id: davi.arnaut@sun.com-20090612211119-\
#   jrxxjz0fx90hj9lv
# 
# Begin bundle
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
hyHEIM9kOoKX/i7kinChIQ4xvxo=



