# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101002060935-ywe6cdu0mgspbz0g # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: f888c08ea9b07cb313e3b0c920e37b5182cca0e3 # timestamp: 2010-10-01 23:09:45 -0700 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: jonas@mysql.com-20101002051711-2a0uf5no8u36niqj # # Begin bundle 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 lYjgKA==