# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: alik@sun.com-20100721141446-rvvvwuudafxhnd03 # target_branch: file:///mnt/raid/alik/MySQL/bzr/00/bug23032/mysql-\ # trunk-bugfixing-bug23032/ # testament_sha1: 1bf8e27c98e0432ea3cda0f416186b9c495a2eec # timestamp: 2010-07-21 18:14:56 +0400 # base_revision_id: jonathan.perkin@oracle.com-20100720093555-\ # gqyrtmkgwrjfgsmc # # Begin bundle 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 cA+l4QY/+LuSKcKEh/3/cBg=