# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110429080204-\ # ql1kyfu0nt9ygdp4 # target_branch: file:///export/home/jl208045/mysql/mysql-trunk-\ # 11765831/ # testament_sha1: 1026d7497c8327deacb1e21f750b2dd27985728d # timestamp: 2011-04-29 10:02:08 +0200 # source_branch: file:///export/home/jl208045/mysql/mysql-5.5/ # base_revision_id: marc.alff@oracle.com-20110428220107-\ # qky2956tychat5kz # # Begin bundle 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 uqAUV/8XckU4UJAABaED