# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090701025302-zno216tu31leen6i
# target_branch: file:///home/daogangq/mysql/bzrwork/bug45214/5.1-bt/
# testament_sha1: 4e20d041f14ef62aa2e18eed2bf4af6eac65b17a
# timestamp: 2009-07-01 10:53:19 +0800
# base_revision_id: davi.arnaut@sun.com-20090612211119-\
#   jrxxjz0fx90hj9lv
# 
# Begin bundle
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
Y8Pgh0PIOnd5GH/8XckU4UJDtg1wLA==



