# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: li-bing.song@sun.com-20091128143627-nxm4dhyzdfs66lft
# target_branch: file:///home/anders/work/bzrwork/worktree6/mysql-5.1-\
#   bugteam/
# testament_sha1: 6adfc0fbc11a60d0c6e92830b944c8c01e565785
# timestamp: 2009-11-28 22:36:37 +0800
# base_revision_id: davi.arnaut@sun.com-20091125130912-\
#   d7hrln14ef7y5d7i
# 
# Begin bundle
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



