# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100427135407-o8pr6clc8kzw10ub # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: 446c9cac228a384880dfa2f3f314c855480e6aab # timestamp: 2010-04-27 16:54:17 +0300 # base_revision_id: marko.makela@oracle.com-20100427135154-\ # 055gtf2dysgt5x0m # # Begin bundle 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