# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101001090306-goxvy249bviw72x6 # target_branch: file:///home/md/mysql/ndb-7.1/ # testament_sha1: 6c7c5b3f48220213e6bff74272dbd5c63d78976f # timestamp: 2010-10-01 02:03:18 -0700 # source_branch: file:///home/md/mysql/ndb-7.1-opt32/ # base_revision_id: jonas@mysql.com-20101001074741-8gu1fj77eyt66zqo # # Begin bundle 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