# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110215092956-m1fq3d03qbebcn1q # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: e9ae32b61ffd2ee526d5d6e80d65a6f8b8e0b10e # timestamp: 2011-02-15 11:31:25 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: jimmy.yang@oracle.com-20110214101751-\ # vt67vyse5dy26vij # # Begin bundle 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 KcKEg4UevXA=