# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20101104083604-\ # fjk8sn2fzbisjkg4 # target_branch: file:///export/home/jl208045/mysql/mysql-5.5-bugteam/ # testament_sha1: 22460eb651f0da6b9629e35863e9d019ccd9da7d # timestamp: 2010-11-04 09:36:11 +0100 # base_revision_id: zhenxing.he@sun.com-20101104052916-\ # p4o89gq34wcnvaj2 # # Begin bundle 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 46HA