# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110215095201-jpr9d1sqngq470f2 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 3ef226982171dd8f02916721e92209c6c5dfe5b2 # timestamp: 2011-02-15 11:53:02 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: jimmy.yang@oracle.com-20110215094034-\ # qqm5uvjwj3912vgs # # Begin bundle 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 5IpwoSCYxjza