# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110506132631-\ # 5wickj6dvrh1dpj6 # target_branch: file:///export/home/jl208045/mysql/mysql-trunk-\ # 11765831/ # testament_sha1: 2e399f4464756c613a690ea52381354150293efb # timestamp: 2011-05-06 15:26:34 +0200 # source_branch: file:///export/home/jl208045/mysql/mysql-5.5/ # base_revision_id: alexander.nozdrin@oracle.com-20110506132138-\ # 46459va9vcbd4nz0 # # Begin bundle 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