# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100629113248-fvl48lnzr44z94gg # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 6ad5b3ad9f49dfb975196ac7ff4b17facec77e74 # timestamp: 2010-06-29 14:33:46 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100628125224-\ # v6m9zst4532fdoix # # Begin bundle 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