# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100421082835-n42x8pzkb63bgh2h # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: 0fee9a133fbccc13e822041d46d8fecedde9fc07 # timestamp: 2010-04-21 11:28:43 +0300 # base_revision_id: marko.makela@oracle.com-20100421063916-\ # h3gwjea7jzjilyww # # Begin bundle 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