# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: zhenxing.he@sun.com-20090520082739-0gn5vblcdz3eiuyg # target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b42415\ # /6.0-bugteam/ # testament_sha1: e46488d8a0317e779b7cb2feb9ad264332cff01c # timestamp: 2009-05-20 16:28:53 +0800 # source_branch: bzr+ssh://zhe@bk-internal.mysql.com/bzrroot/server\ # /mysql-6.0-bugteam/ # base_revision_id: satya.bn@sun.com-20090520055844-e8tlqgcu8w8vsub5 # # Begin bundle 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 K9LA