# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110627070414-\ # j6cjrtzp7zy4yxla # target_branch: file:///export/home/jl208045/mysql/wl4774/mysql-\ # trunk-costvect-refact/ # testament_sha1: 5853b91b29c45d7be37db6b6bb4d9e7b0e62b518 # timestamp: 2011-06-27 09:04:24 +0200 # base_revision_id: tor.didriksen@oracle.com-20110624092907-\ # sy16mrj8w9vz6266 # # Begin bundle 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 in7gQvoslZH/4u5IpwoSFFX9RwA=