# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101026094211-\ # e4762cj6kd8ks6lv # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: c281185e30ba3b92a593b5ffb4793bba72b24316 # timestamp: 2010-10-26 11:42:15 +0200 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0-spj/ # base_revision_id: ole.john.aske@oracle.com-20101026092110-\ # o4zkofqugr7etdbr # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZFv4XEAAYrfgAAQeOP/93f1 2kC////wUAPU866rdjbDRwGpiKT8lPKep4k8mUeJPUNDRpoADQ/U9U9IJRCTE8k2mp6p+oTUY9QA JgINMAAZIm0Kaj2qb1CD02pAaAA0ZA0aaAcwmATACYTCaYAABMmmgYSSTCBTyYhPQCp+Kn5KP1PJ NRp6GkaMaal+k//tgumqmcpGbxy0UOuxj1say3t7rXy7blVU8P6erq7pDTgI0O4vZ10qWlC0+LTt TZijKaUywRDMBlxZ6qq66by6lGShRK7XRGlnQNaSB4UHifOFWi+v9ygVB7ORczufQtIpGxZkhzJF l81L9PaCU+Vg6zbUKZIe4cIas5k2l+Ah4PT4OfIoYZphUdt8wSEdGEO0mfhYEK2pijHOzUb4zDXF +ucHhJ2W4JjZqERsXSGIQGG5RH2hF3UoYRAo77hSCnOT6HCMLr5nBVpICkw/M8y05a2m6QNE8IOG kW/I+ecMhIwTOwYZhNeRoyNZsCeMYaD89TiGNuX9MNwd9oXJs+GOAwjCrK4kKgjrqvAhUmpC/cam +JMSl0Zx3NnQ/GVpXsaBGQlFNdJ1M76dYTbzK+qLpzYsKWrtaNjgHajuGiDJhNqaJundNAxISfJF kwVoQ9pR6OEAHwTwFK8MUy7Ryd/O4kbHHESiHwPleph6vzlgIfeTbi8oNxTI7ANlb9SS5rDUO7Sp HfJxrcH7/A5cfCC8583XskWL9qcbYB3eT7yrxi2FaIs3vSOa1Vdj3GY7XP6mle+zjMFnRFyMTWVU ksTBVlfwpx0VCg5kiaK8raEhskLUzFmSzMV5SSjcSV75HmKBvVHGAsRmQasE0DRcLy1rSTKISQ2Q +c4LRZxPiVCdomOIRAc0YwHvuvszTU23YLJk/CuRca9BRPMUbr4g1TJ4U4uyd+zZl0mjUFSKF/Y4 hLbgbmnw5lzoaJgyD6DJ65uUN2qY5ZA7t5M+D0T1+Ac9BpD6cyr6mu0FUOV2otn6poeuJkuV8DDk D+6/0xwe+dlx5miqYN56R923WLokMcBQBSxDwDUeIvA2hIK3I/XyatI3pDurU3citi5pvgwJFhUW qJiijLJ7xBIWvcwkMAxW1QtJBBM+LjhLMdK6URZMrM9/rSF809XAPb7JGUP+OgzuVCFajdUeyRzC 9cXLbjGe/omzqYy2syZ5LRGrXCMqM5I5k9oa9SWsLElwsZXNtkiizhkPErl/JWpd2mp8LFWvEVI6 Sq0oJR62FtmDVIPeDPKCIZU/WvHFXnTmTMmZDLqn1EXNroYZ2g2H4cktRJeR9L4m9aF4OVIwJUxD acPtvZexNtUGq9JoXDslzByDkmYtJZDQDfsXckU4UJCRb+Fx