# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110215085133-tw1sqyvxzhaw04eu # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 76189fa0109fc9fe3eefe4bc9546452e42996f3f # timestamp: 2011-02-15 11:56:42 +0200 # base_revision_id: jimmy.yang@oracle.com-20110214100759-\ # 0fdjs4ocxc06ragu # # Begin bundle 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