# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20100830090145-q8kj9et16iegwauc # target_branch: file:///home/daogangqu/mysql/bzrwork1/bug54579/mysql-\ # next-mr-bugfixing/ # testament_sha1: 80d3e701ec60d5a8cbfd93e3cd07320888474800 # timestamp: 2010-08-30 17:04:20 +0800 # source_branch: file:///home/daogangqu/mysql/bzrwork1/bug54579/mysql-\ # trunk-bugfixing/ # base_revision_id: jorgen.loland@oracle.com-20100830063809-\ # z3n0eu7qp1h5v3ip # # Begin bundle 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 Dg/hzlB+E0x/UXckU4UJBR2Z7gA=