# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110504112929-3zqhpy29nlyl0sc0 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 672733c5a7ec6204b7bde4bc93a7138107c10361 # timestamp: 2011-05-04 14:33:20 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: jimmy.yang@oracle.com-20110504072951-\ # 6hpqradjdn0r39ww # # Begin bundle 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