# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100602113733-fslfv73nhi0d17t4 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 12b11fe9da6b0f01b931fe90a4d15ada1a6238da # timestamp: 2010-06-02 14:38:00 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: jimmy.yang@oracle.com-20100602110400-\ # 568a3b2gd9uxxxvg # # Begin bundle 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 EB82YbNn0jMkzBx/4DAGAP/F3JFOFCQejtd0QA==