# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20110112102403-m816u0li554mxml2 # target_branch: file:///export/home/x/mysql-5.5-bug42230/ # testament_sha1: a4cc8c6a63fdf48b9440d3b93db5787a42c9bfd0 # timestamp: 2011-01-12 11:24:06 +0100 # base_revision_id: dmitry.shulga@oracle.com-20110111152631-\ # jezu2dbglg05g6ff # # Begin bundle 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