# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100629131907-epjs6h2rv457h7qv # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: bb60faab4d03da913db9998cfe02acb51cd09b86 # timestamp: 2010-06-29 16:19:17 +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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 t+Sc