# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100810102248-xrdjie2de4r9h3ed # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: d12b4d711bb499233de1ebac4936cb3ab7fae595 # timestamp: 2010-08-10 13:23:12 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100809085837-\ # s1nfx6gjf7l6ttab # # Begin bundle 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 wA==