# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110506135735-\ # qw9qba2ohe6b6mna # target_branch: file:///export/home/jl208045/mysql/mysql-trunk-\ # 11765831/ # testament_sha1: 03520217340ab3582d2d0d75937e838eea24fd58 # timestamp: 2011-05-06 15:57:39 +0200 # source_branch: file:///export/home/jl208045/mysql/mysql-5.5/ # base_revision_id: jorgen.loland@oracle.com-20110506132631-\ # 5wickj6dvrh1dpj6 # # Begin bundle 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 ckU4UJDYaZLf