# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101021075006-elz43uh9qp015wle # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 839c2f99d63f82b22036d806097e6aa8dbd48b50 # timestamp: 2010-10-21 10:51:07 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20101021073540-\ # u9hy54of3252uz3g # # Begin bundle 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