# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100505104001-883pqiepo384qr5h # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: 1ac6f8e61bbaa7a48d5dcbb93347df2199a7acdb # timestamp: 2010-05-05 13:40:10 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100505103733-\ # s724cvnstmkz9w4t # # Begin bundle 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