# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20101108104808-\ # 0ecz7ha185qjmi8x # target_branch: file:///Users/shulga/projects/mysql/mysql-trunk-\ # bugfixing/ # testament_sha1: 2569bd666477083004613dc0993401ebcf166137 # timestamp: 2010-11-08 16:48:35 +0600 # source_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\ # bugteam/ # base_revision_id: zhenxing.he@sun.com-20101107044310-\ # ke4o5i3izs5z1w0t # # Begin bundle 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