# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100601120933-r8fnhig5m5qnnohz # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 59592d695acf6f1fa76cd0990d94d04eca158db9 # timestamp: 2010-06-01 15:12:23 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100531152341-\ # x2d4hma644icamh1 # # Begin bundle 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