# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100421095033-0acvzxb8um8cms0a # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: b8b186a9d95bd1ec968573fd013f3c04a1baeddc # timestamp: 2010-04-21 12:50:41 +0300 # base_revision_id: marko.makela@oracle.com-20100421094032-\ # ir4glqk46qvg2ywn # # Begin bundle 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 ncdXa6vv4xCxQLrs/4u5IpwoSCv7a3oA