# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101128124436-fjjpz97pdsrf7n53 # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: 94d1508d2a382f3680fd5f9e446b92044dab9a9b # timestamp: 2010-11-28 13:44:56 +0100 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: jonas@mysql.com-20101128114603-zwf8k9b7524bbz08 # # Begin bundle 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