# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101116132619-\ # 8upi8v7yekd15k0j # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 426ac0be0dd9c476e4d8447aa1d75ceafd48e378 # timestamp: 2010-11-16 14:26:26 +0100 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0-spj/ # base_revision_id: ole.john.aske@oracle.com-20101115143845-\ # 9nt34gfv204q7xs7 # # Begin bundle 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 z/8XckU4UJDJDErx