# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20100928081943-x5ezy1oym3tem5y5 # target_branch: file:///Users/mz/mysql/ndb-7.1-opt64-gcc/ # testament_sha1: a519f4b2bee2fc28f3cdab5c63d57da44037b588 # timestamp: 2010-09-28 01:19:49 -0700 # base_revision_id: martin.zaun@oracle.com-20100928071226-\ # kq4slvxe45kuo39u # # Begin bundle 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 SEbeoT6A