# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110125095450-cme5ynezoivygr8t # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 747c16d8fbfed1c2f4e769f03936642044a8f388 # timestamp: 2011-01-25 11:54:58 +0200 # base_revision_id: marko.makela@oracle.com-20110125075618-\ # 2y2dncnbm8ynzjy7 # # Begin bundle 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 1/4u5IpwoSAaf/2m