# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100428130225-napi1bi6395i5073 # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: efff5dfc26ab98673151ddc36427bd025e9d3fa5 # timestamp: 2010-04-28 16:02:34 +0300 # base_revision_id: marko.makela@oracle.com-20100427135407-\ # o8pr6clc8kzw10ub # # Begin bundle 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