# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100511161828-9reevde6i3sjlwuc # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: b4b7c2c9059557e85ae91cc4cd109ff66cf6a777 # timestamp: 2010-05-11 19:19:04 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100511114422-\ # 4bj3ttf85juwog2j # # Begin bundle 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 +ZkfmPLKff4PYdJc85HCfm/oLuSKcKEgkIM2ug==