# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110620144046-\ # b3bhysbmjq3no1m2 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 272dd4adc9a9c3e2c55b25e6205b129657d701c3 # timestamp: 2011-06-20 16:40:51 +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-20110620142453-\ # 33y3cbegle29h4ut # # Begin bundle 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 MA7gUzgticuqtch+Vxtf/8XckU4UJDrrh5aA