# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110524120557-7g9fzyka7pswlvxw # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # testament_sha1: f9d2a5e6495daad7f6933b5114bd697626688fa5 # timestamp: 2011-05-24 15:07:16 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: marko.makela@oracle.com-20110524084251-\ # vjmufmstzrymzwfg # # Begin bundle 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 5LYA