# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110404090301-i358y3h1z6gbh8qn # target_branch: file:///Users/sunny/innodb/bzr/trunk/ # testament_sha1: bcca4864829662b5c7d464d707ab8ab1c61969de # timestamp: 2011-04-04 19:10:45 +1000 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110404063321-\ # a4h4lh4j4vp5hbi3 # # Begin bundle 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 jhH5v+LuSKcKEh5b7BbA