# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100520114306-oz8mce7y8m7y6p1g # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: 14503f8745c02098b1d74f0ac20f16ae66ed2eae # timestamp: 2010-05-20 14:44:06 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100519204850-\ # d7odvjyfx1gv6fms # # Begin bundle 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 //i7kinChINDAaUA