# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100716145550-tnxirl98g17eyr3y # target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing/ # testament_sha1: f01872a9983f605c3d0373aa850f9a2dcd0da3f4 # timestamp: 2010-07-16 08:56:12 -0600 # source_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing/ # base_revision_id: marc.alff@oracle.com-20100716012830-\ # 9nkc2ixkxm6lxlee # # Begin bundle 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 FCQZ7gA7QA==