# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110414063144-3rk059m99e6xday8 # target_branch: file:///Users/sunny/innodb/bzr/trunk/ # testament_sha1: 0c0f1dfb1e303592928bff4c4a188595182b36b5 # timestamp: 2011-04-14 16:35:07 +1000 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.5-innodb/ # base_revision_id: jimmy.yang@oracle.com-20110413132746-\ # mqeq717lsypuynjb # # Begin bundle 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 BRi8KVxot6lgUBSNG5/xdyRThQkALRaHkA==