# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100514133144-fe0l0b89tea4x4uu # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: 3e0aff19ee171361d1efa1a43c16f913765da816 # timestamp: 2010-05-14 16:32:11 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100513075309-\ # cqb3hwj2miapcwmz # # Begin bundle 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 v5P6gZpOv7P/F3JFOFCQFp/GXQ==