# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110317122532-\ # g2p0ly3ta03hzak3 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 36c809f096698bad15aadb516e2eb2d73ef98bea # timestamp: 2011-03-17 13:25:37 +0100 # 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-20110317081718-\ # xy12jhdkxg8zk3p8 # # Begin bundle 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 kU4UJCJIYG1A