# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20100929100740-hdyskhs16mv7z3wp # target_branch: file:///home/md/mysql/ndb-7.1/ # testament_sha1: 8f20368267de75db271f217dea6bec464563f472 # timestamp: 2010-09-29 03:07:54 -0700 # source_branch: file:///home/md/mysql/ndb-7.1-opt32/ # base_revision_id: magnus.blaudd@sun.com-20100929085527-\ # lnssoj142ykv6yol # # Begin bundle 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 ZBegFJmRrw/2fgf/F3JFOFCQlFX5kg==