# 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:55:45 +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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