# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101020135302-\ # 6x91z3q0mggaiv2f # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj/ # testament_sha1: 5813e4cbf77c2b68ee172a65c149438f8947ee09 # timestamp: 2010-10-20 15:53:07 +0200 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0/ # base_revision_id: jonas@mysql.com-20101017195146-egjjeui8v14c7bpd # # Begin bundle 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