# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20091013081221-j0quxoyd9e64aix4
# target_branch: file:///home/daogangqu/mysql/bzrwork/bug46640/mysql-\
#   pe/
# testament_sha1: 427b536fbd8edbee7b6d06cddb6d20e5c36ec61c
# timestamp: 2009-10-13 16:14:06 +0800
# source_branch: file:///home/daogangqu/mysql/bzrwork/bug46640/mysql-\
#   5.1-bugteam/
# base_revision_id: v.narayanan@sun.com-20091012100129-\
#   f9vs6jw7xn7kp4xv
# 
# Begin bundle
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



