# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110304144617-\ # jlybxl8ukw6uj8ib # target_branch: file:///export/home/jl208045/mysql/mysql-5.5/ # testament_sha1: 01d0e632e8745fa4673f905801d8a17e885529e5 # timestamp: 2011-03-04 15:46:20 +0100 # source_branch: file:///export/home/jl208045/mysql/mysql-trunk-55385/ # base_revision_id: build@mysql.com-20110303214612-2vtixvr7ywy7e48f # # Begin bundle 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