# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100414133947-3olt8ckhyytg0z80 # target_branch: file:///Users/malff/BZR_TREE/mysql-6.0-codebase-\ # bugfixing/ # testament_sha1: 53dad20b830ce9a4de07d27169205fefe8b5c7ff # timestamp: 2010-04-14 07:40:43 -0600 # source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/ # base_revision_id: horst.hunger@sun.com-20100414085431-\ # 6ht65240350cx518 # # Begin bundle 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