# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090701133400-c56zn1g0d4ultvi1
# target_branch: file:///home/daogangq/mysql/bzrwork/bug45214/5.1-bt/
# testament_sha1: e6f1c0b662c51bcc129992d51e6734c40e8eda45
# timestamp: 2009-07-01 21:34:18 +0800
# base_revision_id: davi.arnaut@sun.com-20090612211119-\
#   jrxxjz0fx90hj9lv
# 
# Begin bundle
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
U4UJB7HdJWA=



