# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101125141028-\ # xug18df08zzwgmsn # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: fee967a137bb87718310913af18bdde7e56ef268 # timestamp: 2010-11-25 15:10:35 +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-20101123072824-\ # pln4ozgkfol812mk # # Begin bundle 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