# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101003043404-x994vq1ah7e0ie2o # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: 6b44b76b1b3583a93661df49d47fc550533477e4 # timestamp: 2010-10-02 21:34:16 -0700 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: martin.zaun@oracle.com-20101002060935-\ # ywe6cdu0mgspbz0g # # Begin bundle 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 u8ZVoA==