# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100629132105-zzdqxv00w8r8hq6r # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: bf91c83bf023e72fd300eb1b8271414c8baf56ed # timestamp: 2010-06-29 16:21:12 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100629131907-\ # epjs6h2rv457h7qv # # Begin bundle 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 Yj8AoHR/F3JFOFCQLnkDIA==