# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101027070352-rs6mrlgx3lj1fn6r # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-next-\ # mr-innodb/ # testament_sha1: 7f8727788e8ff2e9c6858a03c228834ff6409572 # timestamp: 2010-10-27 10:04:23 +0300 # source_branch: bzr+ssh://bk-internal/bzrroot/server/mysql-next-mr-\ # merge/ # base_revision_id: marko.makela@oracle.com-20101027064342-\ # eq5x8kh8vtg9nd8n # # Begin bundle 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 zPUCMgaFhAM6+Qy7fd/4EQ5B8xdyRThQkNBQ63Q=