# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101206113821-\ # sqapd2qqs28vz9y6 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: af621153ff832ee320e4085344a058b0053cea32 # timestamp: 2010-12-06 12:38:27 +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-20101203165943-\ # i2v00tjho8yxg7da # # Begin bundle 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 0J2QVEMcD/4u5IpwoSD5Z/VI