# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20110202071641-075u8ua13s1ckk47 # target_branch: file:///Users/mz/mysql/ndb-7.0/ # testament_sha1: 3f3158ff0a25640accf1457a5334fe692739df14 # timestamp: 2011-02-01 23:17:45 -0800 # source_branch: file:///Users/mz/mysql/ndb-6.3/ # base_revision_id: magnus.blaudd@oracle.com-20110201145855-\ # p71typ0fhvh7z2fe # # Begin bundle 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 XckU4UJAABukmA==