# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090625092423-8ckumghpa6f73f5f
# target_branch: file:///home/daogangq/mysql/bzrwork/bug45214/5.1-bt/
# testament_sha1: 047719b03bf0337c3bfcd49a47f2f0a82f5ad130
# timestamp: 2009-06-25 17:24:43 +0800
# base_revision_id: davi.arnaut@sun.com-20090612211119-\
#   jrxxjz0fx90hj9lv
# 
# Begin bundle
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



