# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110509081226-onfko5tb7vsqsay0 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 4fa1d073722d2a45eef72a36f5a3d7d8011c920a # timestamp: 2011-05-09 11:12:39 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: jimmy.yang@oracle.com-20110504104730-\ # vuk3u1iicmuy6puh # # Begin bundle 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