# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110412012137-fqao8q5x283ub8f6 # target_branch: file:///Users/sunny/innodb/bzr/trunk/ # testament_sha1: 1f1f7a5908a46f18fae87b14a57dd49f61bb63b0 # timestamp: 2011-04-12 11:35:19 +1000 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.5-innodb/ # base_revision_id: inaam.rana@oracle.com-20110411155535-\ # u3np9whtrzwlhbcj # # Begin bundle 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