# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100812105605-tub7iit04d7wabva # target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-\ # merge/ # testament_sha1: 4daa63c889d4f29577f295dc116424b3ab918d1a # timestamp: 2010-08-12 04:57:35 -0600 # source_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing/ # base_revision_id: dao-gang.qu@sun.com-20100812002610-\ # o647khcyjj0siu7g # # Begin bundle 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