# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101111102227-n4yqj9cr89u9xpns # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: fbe8223bd574c537c7f447e7a27a65f9bedf9d5b # timestamp: 2010-11-11 12:24:08 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20101111065041-\ # tn07yzd1ne9x8cz8 # # Begin bundle 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