# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090716065643-93ds302d8mgbdzhb
# target_branch: file:///home/daogangq/mysql/bzrwork/bug45214no/5.1-\
#   bugteam/
# testament_sha1: fff3721563fb4102e1ca38c3d77300d8b65af67f
# timestamp: 2009-07-16 14:57:05 +0800
# source_branch: bzr+ssh://daogangqu@bk-internal.mysql.com/bzrroot\
#   /server/mysql-5.1-bugteam/
# base_revision_id: davi.arnaut@sun.com-20090715182250-\
#   ru0l00nqqlcfqe8n
# 
# Begin bundle
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



