# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110614054938-s4ym2mxxmxtvyazd # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # testament_sha1: c15365171f00adf9d239c274f854d2881733622f # timestamp: 2011-06-14 08:51:45 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: mayank.prasad@oracle.com-20110613184641-\ # urwe16r0ikrb86l8 # # Begin bundle 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 PnyI