# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110217203022-uwn13k1ez7xmaovw # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 755690725e6cd9762b17306c25eec3d245cd1744 # timestamp: 2011-02-17 22:31:32 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110217171753-\ # 7i3oazz7l58pec9l # # Begin bundle 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 d78v/i7kinChIRbAYOY=