# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100827215159-wgoh13bi5fecden6 # target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\ # merge/ # testament_sha1: a48e5f58b53ff40785a880f90b1a3daae6bccc41 # timestamp: 2010-08-27 15:52:30 -0600 # source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/ # base_revision_id: svoj@sun.com-20100827072008-g1fdvfp4asq94k38 # # Begin bundle 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