# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100909121405-vvfiuolgr7iumjz7 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 66d92e2697f86a577d6426984282932d02217796 # timestamp: 2010-09-09 15:14:47 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100909100643-\ # cocooto4dcnixxmh # # Begin bundle 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 Uf8XckU4UJB8aoTn