# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110127114515-3hcshnbfiq5qryq6 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: b4fb89ee4a87ec6de4166f5d122dc52874dc8f5e # timestamp: 2011-01-27 13:46:21 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: jimmy.yang@oracle.com-20110127094841-\ # bqzl0nzm9snx95n1 # # Begin bundle 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 Go8A