# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100603095032-v5ptkkzt1bhz0m1d # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 76b2ccaa8ebbe8eb9938a3be143ff03c8020c477 # timestamp: 2010-06-03 12:50:46 +0300 # base_revision_id: marko.makela@oracle.com-20100603094859-\ # 8cibt7xns239jjvc # # Begin bundle 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 8DA2s52BdB6BXiZD/xv/P/i7kinChIPzCEl4