# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110215094626-c84lyhxyekdoe2in # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: bdd6d143388b75a6013f938a3bf0c2a70d33b3d8 # timestamp: 2011-02-15 11:47:36 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: jimmy.yang@oracle.com-20110215073234-\ # ru6odfuhhxdjpb19 # # Begin bundle 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 kA8jW7Dj/4dT97/8XckU4UJAF0PoRA==