# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100624060842-bkagpd3u6qii6odd # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 5b3035bb35f0cd171ebf3f10bc6f41a2ebda8111 # timestamp: 2010-06-24 09:08:48 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100624060146-\ # enwqipupmqrghgcq # # Begin bundle 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 czF615II8K1Qd/xPl/4u5IpwoSAV/awe