# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101103125115-xg1b5zsgyeatvgz2 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 7f0ff3432df511df9ee00f34e0a9971ef30fea65 # timestamp: 2010-11-03 15:01:17 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20101103092514-\ # w73qo0gcguyo592i # # Begin bundle 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 TsDdPMf4MprP8XckU4UJBSOW5iA=