# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110401124309-\ # 6vi7e4095p14x495 # target_branch: file:///export/home/jl208045/mysql/mysql-trunk-\ # 11882131/ # testament_sha1: 28a29f421ba3148caf723e5034c02531767f9de0 # timestamp: 2011-04-01 14:43:13 +0200 # base_revision_id: mattias.jonsson@oracle.com-20110331143551-\ # q8lg4fcceeof0yrl # # Begin bundle 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