# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dlenev@mysql.com-20100212142135-79emefx954r1icyt # target_branch: file:///home/dlenev/src/bzr/mysql-6.0-codebase-4284/ # testament_sha1: 8148e2d649f2f25b92d24051047a52802875b9d6 # timestamp: 2010-02-12 17:22:45 +0300 # source_branch: file:///home/dlenev/src/bzr/mysql-next-4284-bg50908/ # base_revision_id: kostja@sun.com-20100211211409-44o1ty0g0iebmesu # # Begin bundle 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