# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101208154150-\ # 6eun5m33b207mivj # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 03be767aed3ca7972bfaf44d437ef3b150bc5803 # timestamp: 2010-12-08 16:41:55 +0100 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0-spj/ # base_revision_id: jonas@mysql.com-20101208102440-32uyaa6cq4t5vd36 # # Begin bundle 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 JCsy1hXA