# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101102074124-bu1zvivc8ai11bt4 # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-next-\ # mr-innodb/ # testament_sha1: 88383956e954ccba9eaff217dbea7113da4acdef # timestamp: 2010-11-02 09:42:21 +0200 # source_branch: bzr+ssh://bk-internal/bzrroot/server/mysql-next-mr-\ # merge/ # base_revision_id: vasil.dimov@oracle.com-20101101100514-\ # udi2i9i6xmfuixah # # Begin bundle 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 zEyp8k/+LuSKcKEhLkPUrg==