# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110623095141-379yy9lk2mt6x30y # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # testament_sha1: c1746a42e8bf3eb3d94bf19c04c0ce915cfb720b # timestamp: 2011-06-23 12:53:28 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: vasil.dimov@oracle.com-20110623064848-\ # cdjl7c0kg3z4b8vo # # Begin bundle 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