# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101027070543-qr15z0d85tgfaugc # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-next-\ # mr-innodb/ # testament_sha1: 1779723ed4652204f3d0b6db9e8eb9df29e3a301 # timestamp: 2010-10-27 10:06:31 +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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 BRg=