# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101207172702-\ # 10htessx2apylwp2 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 471150ce2ecc2ae6845d00f16af30645fc5402f0 # timestamp: 2010-12-07 18:27:06 +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-20101207150629-\ # 4ccfweuygzyj0dq7 # # Begin bundle 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