# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101221093919-mcmmgd4zpse9567d # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: d5797b9447c5edd24e13b67689eb7b60f67ffc52 # timestamp: 2010-12-21 11:39:33 +0200 # base_revision_id: vasil.dimov@oracle.com-20101214093819-\ # wb2offmkgzcz2725 # # Begin bundle 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 s/LakveBtgZmQWpL/i38f/F3JFOFCQ4f2uJg