# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100525130444-p46qqqruexmc2tua # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: fb34c12ee4ca5e24b76b435e52681af2e10d6dff # timestamp: 2010-05-25 16:04:57 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100525073606-\ # fb1h2behst3yqn3e # # Begin bundle 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