# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110321090105-\ # ou67r5inm3bt4jc1 # target_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\ # mr-opt-backporting-wl4800/ # testament_sha1: 89eab5b58cb85f04fdc69fb66998b470e8e16c84 # timestamp: 2011-03-21 10:01:09 +0100 # source_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\ # mr-opt-backporting-wl4800/ # base_revision_id: guilhem.bichot@oracle.com-20110317154917-\ # d3l87war96tdwojh # # Begin bundle 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