# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101027194451-93lcsw5s9se1ynjv # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-next-\ # mr-innodb/ # testament_sha1: f2f370f0b29c84d1336e838999d492f77bcab5e9 # timestamp: 2010-10-27 22:45:29 +0300 # source_branch: bzr+ssh://bk-internal/bzrroot/server/mysql-next-mr-\ # merge/ # base_revision_id: vasil.dimov@oracle.com-20101027145646-\ # 5w92lw3ocpo97cap # # Begin bundle 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 wNE8T/F3JFOFCQMby0nA