# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101020021243-yhxyhc6yf9fuug2m # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: c175d7b5a9804b44abf61c023bc107dbc61eda25 # timestamp: 2010-10-19 19:12:54 -0700 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: martin.zaun@oracle.com-20101020011440-\ # isra2bdj0u4if573 # # Begin bundle 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 Nji/+LuSKcKEhnB33mg=