# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110406062236-y11o0ddrwgxnvw8i # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: d607577333c8cc742012afea4e3e42507c7122c6 # timestamp: 2011-04-06 09:22:50 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110405111854-\ # 2x7cmsl3dzr530ue # # Begin bundle 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 woSFkU9o2A==