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