# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101123072824-\ # pln4ozgkfol812mk # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 4b3ce730e60d05b9d237a451c9d3793b87cde989 # timestamp: 2010-11-23 08:28:31 +0100 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0-spj/ # base_revision_id: ole.john.aske@oracle.com-20101119112546-\ # 8u2cq2m95950w6u1 # # Begin bundle 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 L4X/+LuSKcKEhaxgZCg=