# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101015134738-\ # dsgvvwgfo5nunok8 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: fadf025b4f574081163e288e8004bac131e903c5 # timestamp: 2010-10-15 15:47:44 +0200 # 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-20101011131851-\ # 3mdg0xqfwa92yh0a # # Begin bundle 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