# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20110202072417-azmm953up84cp1co # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: c305abc4310788eaea1ccdef9d4c11f3f583d553 # timestamp: 2011-02-01 23:25:26 -0800 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: craig.russell@oracle.com-20110201185243-\ # awcbn68swwjubi4q # # Begin bundle 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 OZ1+R2Ha//UPGhVfTo/8XckU4UJBGYQ3eA==