# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100420100359-flodcsrocnjfogvr # target_branch: file:///Users/malff/BZR_TREE/mysql-6.0-codebase-\ # bugfixing/ # testament_sha1: 90cb3e074b3167ed69039b0da4c29c2045e0867d # timestamp: 2010-04-20 04:04:29 -0600 # source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/ # base_revision_id: alfranio.correia@sun.com-20100419153500-\ # q0gf6nxav8gw3o16 # # Begin bundle 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 OFCQwhswdA==