# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20090930041614-7x8guquxz1yz9mua # target_branch: file:///home/daogangqu/mysql/bzrwork/bug45677/mysql-\ # 5.1-bugteam/ # testament_sha1: 63195f43a3e5b4cce11a0b1e12df117eaf6031fa # timestamp: 2009-09-30 12:17:32 +0800 # base_revision_id: dao-gang.qu@sun.com-20090930023125-\ # 2wt61sustseay9t0 # # Begin bundle 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