# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100602111251-pnh475khxxy8lskx # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 2910724aff28068402b8c938c2e9523460780b88 # timestamp: 2010-06-02 14:13:07 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100602105045-\ # 30mdh49geqmogtsi # # Begin bundle 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