# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101006061504-kal0tgjjm7igz641 # target_branch: file:///Users/mz/mysql/ndb-7.1-opt64/ # testament_sha1: 97b7c7245a1054961a20e58917ce7167a50ffc8e # timestamp: 2010-10-05 23:15:18 -0700 # base_revision_id: martin.zaun@oracle.com-20101005084830-\ # 431upumcvshncq1u # # Begin bundle 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 SrBwDgftf8XckU4UJCWvQysA