# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110107140638-\ # wu2agbp7a1p4nso3 # target_branch: file:///export/home/jl208045/mysql/mysql-trunk-\ # bugfixing/ # testament_sha1: 8815a4e8b2e0e7605a3ba44585f74b1ca9ebfe33 # timestamp: 2011-01-07 15:06:41 +0100 # source_branch: file:///export/home/jl208045/mysql/mysql-5.5-bugteam/ # base_revision_id: dao-gang.qu@sun.com-20101229053531-\ # 6jamezb1vubx5t3r # # Begin bundle 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 T0gTCxmpyKONTWr7Jbl/+LuSKcKEga6tPqA=