# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110223064815-of3naq4lh6kle1va # target_branch: file:///Users/sunny/innodb/bzr/5.5/ # testament_sha1: b9f8ebe255fba65f036e7aafb982071ccbf7410e # timestamp: 2011-02-23 17:51:56 +1100 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.1-innodb/ # base_revision_id: sunny.bains@oracle.com-20110222202434-\ # zfm1ju5ny2e9nkjb # # Begin bundle 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 UTDHQCOxfYZS9BqbT1JQDT//F3JFOFCQR8rIbQ==