# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100505123901-xjxu93h1xnbkfkq0 # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: 670075e25a9c8d856ae48bad5e4e4e4e1e525115 # timestamp: 2010-05-05 15:39:09 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100505120555-\ # ukoq1gklpheslrxs # # Begin bundle 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 1qcM9QuGGJxm9flWb/i7kinChIPAH0EQ