# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: epotemkin@mysql.com-20100512160352-zzhzqzsj8gcdmgze # target_branch: file:///work/bzrroot/backporting-next-mr-bugfixing/ # testament_sha1: c25da13ba8ce059c13d49fe386db90590b276625 # timestamp: 2010-05-12 20:03:58 +0400 # source_branch: file:///work/bzrroot/backporting-src-6.0/ # base_revision_id: epotemkin@mysql.com-20100512154610-\ # k31o9poyq08zwpqw # # Begin bundle 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