# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101004103805-c1wux0qfs684x6c8 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: eb094516fecf75fb1d2d253f426695dec9ea13b6 # timestamp: 2010-10-04 13:38:38 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20101001115100-\ # 94b30mpyzrpxpa1z # # Begin bundle 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