# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20090914101916-qr9o00uohu4h2scu # target_branch: file:///home/daogangqu/mysql/bzrwork/bug45677/mysql-\ # 5.1-bugteam/ # testament_sha1: 1c48c0e777a0891f2b30182ec14e40ee4cc8b1df # timestamp: 2009-09-14 18:19:37 +0800 # base_revision_id: dao-gang.qu@sun.com-20090831022601-\ # h2ikk473x5njqq29 # # Begin bundle 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