# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100512111926-jaz947yfip1exxix # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: d18918d7d045f67f8dd90b9c3bc2ed24f0933aee # timestamp: 2010-05-12 14:23:41 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100512091350-\ # idbzw2ihdqlgkfch # # Begin bundle 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