# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100504083805-zlenrjv68ix2jfpm # target_branch: file:///Users/malff/BZR_TREE/mysql-6.0-codebase-\ # bugfixing/ # testament_sha1: 49494faec4baff2748a7a2383e9394df7c14d9cc # timestamp: 2010-05-04 02:39:08 -0600 # source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/ # base_revision_id: marc.alff@oracle.com-20100504065544-\ # ytlcnsdixstsw8yn # # Begin bundle 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