# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110127113059-g5s3u7pdce5ps6g1 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: cce538907ee4d5d6fb74bb8d1968c2f3b7dfb15b # timestamp: 2011-01-27 13:32:24 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110127081200-\ # xib4soiobnw0wf1q # # Begin bundle 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 I8TI8r0g+gI/wGZ+J/Iu5IpwoSGJkabE