# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110504132932-\ # dkodohvquduwdykr # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: f9adce66a4bbaf74c5ac7cafbfcd2b35c72d569a # timestamp: 2011-05-04 15:29:36 +0200 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0/ # base_revision_id: ole.john.aske@oracle.com-20110504114848-\ # u6f9k6l2rmdbvnvg # # Begin bundle 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