# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100603102840-c8rid5bzx5fkmmz6 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: a4e5b80824fb86902790335996f2ecd121ce9af7 # timestamp: 2010-06-03 13:28:55 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100602124905-\ # dkytr8p2v3t52n5n # # Begin bundle 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