# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110615072612-\ # s0oyctk5qqhxkeou # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 7033cf3a28ed2d0b89755d79ef9fa3a214926976 # timestamp: 2011-06-15 09:26:17 +0200 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0/ # base_revision_id: jan.wedvik@oracle.com-20110607122602-\ # mh1ynpusoxfysa1q # # Begin bundle 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