# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101020114628-ly1tyc8etgxr985x # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 56b108340a8f948df84b6fc90d5b2b45bf17cb94 # timestamp: 2010-10-20 14:46:36 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20101020074151-\ # fzq92i9foycm1e0c # # Begin bundle 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