# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110414084722-\ # 66dxut2cygwuxbxv # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 418466139a2d962c312e218d12ec4022ceb6f293 # timestamp: 2011-04-14 10:47:28 +0200 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0/ # base_revision_id: jonas@mysql.com-20110410173241-wre1ijfcxw3ixjp9 # # Begin bundle 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