# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100525125352-hgafpmqhrrj7pv5i # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 9e051b2a1c2d1ec96a9e332baa440140b37989f1 # timestamp: 2010-05-25 15:54:53 +0300 # base_revision_id: marko.makela@oracle.com-20100524114349-\ # 5kaw52sz0yh4szkb # # Begin bundle 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 DI+B/8XckU4UJCFVsaRA