# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101022005207-qt9mnfjz9wh97bmg # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: 7ec063b132b4fc17f0d5ac7d8c4de93b75bc4eb6 # timestamp: 2010-10-21 17:52:28 -0700 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: jonas@mysql.com-20101021120816-q20dk9ic3qyb4xof # # Begin bundle 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 8R5eoUJB1juHU8YZ21kJ1f8XckU4UJDFB+AR