# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110222202618-pojg6oh9l8lbhgs2 # target_branch: file:///Users/sunny/innodb/bzr/trunk/ # testament_sha1: bc28cd154dea488deb4b4a20cd61858538dac84e # timestamp: 2011-02-23 07:27:52 +1100 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.5-innodb/ # base_revision_id: sunny.bains@oracle.com-20110222100007-\ # 9b6flyq9bz3sgame # # Begin bundle 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