# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.skold@oracle.com-20110622123508-h0gyuxr5qzogcekp # target_branch: file:///home/marty/MySQL/mysql-5.5-telco-7.0/ # testament_sha1: f9b6e832fec334c47bf7d5df2b19619f7ed1ddf6 # timestamp: 2011-06-22 14:35:19 +0200 # source_branch: file:///home/marty/MySQL/mysql-5.1-telco-7.0/ # base_revision_id: martin.skold@oracle.com-20110622112927-\ # zfizdk9q0o0b8b6o # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTqOq7MAAhHfgEAQUGf//3au nAC////wUATDygDvbtOhxzMYSSJMp7QmjT0JoKemSPSNGnqMT0npNPFBzTEwAJgAmAAEwABMGijS fqZQ09TRoBoHqDQAAAAJJU9Ceqfqj2pMQaManqaMTJ+pNGjTJoGBKIAhoRo00ZNAqPKPUwnqGIMn pFCK89wxx9T26RunQ2fI6oLmAvezOz1vnkdPYfcwGZmYOX6R7ySzOqYgzNJI4fXic7y3kxDxOlGv 0XLrDDnEc5w8ZVGJ7wqvm0UnLrbrLsPAHsI7s9cA5oXPdtIAaQ9CjJn1D7ZfhnhkCtssyv5oJaxH IgqYDK3m8cCcuzJCNUE7gwsedHuopALQYiEDAkA1tymZ6pvVkC8xUN9WLgOi6PCawDQT7YS8HVj0 js4m6XniQCQIoKDE2LCLvYcBbFHN7M32v9gX5JpXm+ZlYdbBnOsiW8zmNKHA34tDFi4yp6g5UEdw LEooDcgSBMeTUCm4rqHVBFHbEuUem1UKSNsKanipztzRmfLIsvRdBgEPBibNxgm9luZAvKpjKmlg VDRj1UVqt8GRXdrrC6Q5K+JjCzXR9AMcgbHcjH5NvN7Knl20JZl5kgat+5bxksaavNgeoOOMYPRC A0qfInkbbmqji9o+Kf8dDv1sOq1JncxN7BzTTBxF+3NjzoX7zoYWVY4hiRJW+h1XmTHRigbJTK4w hftbxrlc67rBMBxE7Glc3wLUvjJLC8qKTWoqDp6nFRijKoYYueo4DYAx4lQIoA0NChITpx+BV2lK to2cuOGDBrL7kKfeaiAPTMN9Gqk+z9KHlB+G86jTv9YFZ9z2KJ6qUKyfkJgJhkbEB35/JwjWBqp4 HDXs+FUyxboXeh5oVdNJXIj8G3hfEplfmhSl1J0KVtFec1mYthGbsXX1K+A4tdBVYO3ZlAkRGJVk D1qhx4ewEke3ZM5kLRYJWaiMk87LAI7c2lsNJ5yZHwDsCUdpMSGpBMJ4ES3/AtfEu49y71AUkCn1 qMrIilfTo9NIHOdhrhoyC6tZPRBCChNCxqoIrz8iNMJgjFuOQCZ07R5uKLMfvSmTBTGWrdVHO1Eo mnQOQ6sMpkMrGwvw0DlGpZvI2neWq1y37G1b9YGMU1WN67R5NECuO0BtQmq3E1iNB8KNRko7kNLK sonFrIXJEOuFb8qJrEbx/bQnG33+jzIduTPc1GZRRf+YJDTAZHCystKhIBWTQuaGa80E7F6CKDjX JZyUSsZJBPK2jeQf2fsijMErNG3GcvQwjBHi9l99pMmoIqFRXMchSAqmZeSpCMJ28IIkFDAm1OlO nHwmpIn0LyArQrKSgEWmoIaeCFiQ5eljCxezd8Up6Ur1TDA5cs74YqMijAPAaQD+6upSAmSDK6Jb spfFOx97lLCJBYXX4rZqUKZHi/S6/A3ELpsq+TVEESuNhFIeYMVQ3nzZmp1BFzMlaY0VDwdljC5k x2R4FDvF5oEiC3t3EKt747kcMBX5drxUE0sRKA3swKCmvc5VyL+ZPQchPmYGYHjtCCOlohM/HnjV sZd50JEPKfDRTAfe5oFqC7cg6+eOAKBO8pw5CYJ4FNq6Q4i7kinChIHUdV2Y