# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sergey.glukhov@oracle.com-20101221113411-\ # aggnvlrbao9o1e3o # target_branch: file:///home/gluh/MySQL/mysql-5.1-bugteam/ # testament_sha1: 0981d3641097e8c94d15d833bdf7c2b7c5c78a8c # timestamp: 2010-12-21 14:34:14 +0300 # base_revision_id: dao-gang.qu@sun.com-20101221044722-\ # sm5icpssww0o46l8 # # Begin bundle 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