# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100504065544-ytlcnsdixstsw8yn # target_branch: file:///Users/malff/BZR_TREE/mysql-6.0-codebase-\ # bugfixing/ # testament_sha1: b26ef388b96ba352f25a264a353938fba5ddf9a7 # timestamp: 2010-05-04 00:56:32 -0600 # source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/ # base_revision_id: marc.alff@oracle.com-20100503161332-\ # vldypa4jy22rcnla # # Begin bundle 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 eubmqPVoxjH+LuSKcKEhs6vIzg==