# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101003045325-g1kko004shqagcb3 # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: 626d5d130cf39c6b9c49d90f03c3eadb9c02501e # timestamp: 2010-10-02 21:54:17 -0700 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: martin.zaun@oracle.com-20101003043404-\ # x994vq1ah7e0ie2o # # Begin bundle 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 N7nw/8XckU4UJBfVIRdA