# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20110111201130-7cty4c9u21xd2x7x # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: 9f74757b285a722fcf3b5331f16b8ef186990ff1 # timestamp: 2011-01-11 12:11:40 -0800 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: martin.zaun@oracle.com-20110111174301-\ # 531fsxh2mejvn7t4 # # Begin bundle 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 SRWJzbMcHDSTUaAFKpSdaf+LuSKcKEgKfsLfgA==