# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20091014013905-yeq3mio659tqczby
# target_branch: file:///home/daogangqu/mysql/bzrwork/bug46640/mysql-\
#   5.1-bugteam/
# testament_sha1: d72b5675c38b4aca3dfe656049a7c6aecaa8a750
# timestamp: 2009-10-14 09:39:23 +0800
# source_branch: bzr+ssh://daogangqu@bk-internal.mysql.com/bzrroot\
#   /server/mysql-5.1-bugteam/
# base_revision_id: satya.bn@sun.com-20091013071829-zc4c3go44j6re592
# 
# Begin bundle
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
X/4u5IpwoSHBCxyW



