# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110222092319-2o2340e3hfpqr6by # target_branch: file:///Users/sunny/innodb/bzr/trunk/ # testament_sha1: 70c6bcb7540de89aeefb7e47cc08c4775ab37747 # timestamp: 2011-02-22 20:26:21 +1100 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.5-innodb/ # base_revision_id: sunny.bains@oracle.com-20110222051115-\ # 961r2uga8u59copx # # Begin bundle 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