# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101021073540-u9hy54of3252uz3g # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: b9a3a73a72083043db2fd9a9e1e1b338c2044919 # timestamp: 2010-10-21 10:36:48 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: sunny.bains@oracle.com-20101021030820-\ # 3vdb3z0b43y403de # # Begin bundle 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