# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20090902052351-d4djof95ewpiyi18 # target_branch: file:///home/daogangq/mysql/bzrwork/bug45677/mysql-\ # 5.1-bugteam/ # testament_sha1: beae08062b4df6904e4721da83e85c50c7f13392 # timestamp: 2009-09-02 13:24:15 +0800 # base_revision_id: azundris@mysql.com-20090831195422-o13kn73s2hsnk0z0 # # Begin bundle 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