# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090702105559-nsa1slgz3i8cxuxn
# target_branch: file:///home/daogangq/mysql/bzrwork/bug45214/5.1-bt/
# testament_sha1: 0068617ef4f8de747b96536c801edd3a9ce7e7ca
# timestamp: 2009-07-02 18:56:25 +0800
# base_revision_id: davi.arnaut@sun.com-20090612211119-\
#   jrxxjz0fx90hj9lv
# 
# Begin bundle
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



