# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mattias.jonsson@oracle.com-20101206113710-\ # e36woi0el8g55gqy # target_branch: file:///Users/mattiasj/mysql-bzr/b57924-51-bt/ # testament_sha1: b055fb7043030c82a042ba55905de40f3e2a25dd # timestamp: 2010-12-06 12:37:28 +0100 # source_branch: file:///Users/mattiasj/mysql-bzr/mysql-5.1-telco-7.0/ # base_revision_id: mats.kindahl@oracle.com-20101202081421-\ # 7udci9op4lc6jvtb # # Begin bundle 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