# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100629132105-zzdqxv00w8r8hq6r # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: bf91c83bf023e72fd300eb1b8271414c8baf56ed # timestamp: 2010-06-29 16:24:52 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100629113248-\ # fvl48lnzr44z94gg # # Begin bundle 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