# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100629130058-1ilqaj51u9sj9vqe # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: ebf0964e937ebf79a4acf511a8ea8b896307a862 # timestamp: 2010-06-29 16:01:09 +0300 # base_revision_id: marko.makela@oracle.com-20100629125653-\ # t799e5x30h31cvrd # # Begin bundle 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 yRThQkFfKQNM