# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101221103810-\ # uggochx2uza194eu # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 01cab351f1bb9a3f19beda0edb7cb580981bdfec # timestamp: 2010-12-21 11:38:16 +0100 # 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-20101209125308-\ # ohqk2q83bou0prz4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWc4S2PwABPR/gFVwACh5//// /3f+6r////pgCh9eyby3Up0NZTW2xlo0aOjQAUKMNEI0hqHo1NBp6T0T0hieao9I08oNqAAAA9QB zTEZGTTJoBkNGQyZAAADI0yNAwhkCUU1PNTQajJqZqeqbU9IZqaaHpD1NNAAAAANACU0iZEp4p4K D9EnqPUaBkY9QTEep6jI0ANNAPQhzTEZGTTJoBkNGQyZAAADI0yNAwhkCSIgE0xMmgTTU8SY1GTU 8kaE2mU/RQeU9TEaaG0mlAIWnWfpzHgew/OU/QiECJ8SRLg3A/EJZimg+ZUdw9Q6O8TEFBoGLrP4 xG9JiUduolxQ9363hSLWLbOKxK6/Dr2KZHYj0xw1MiplNWylk94pZ803IbBAsCvlJ4xBrw2TtdG9 q/eWO4+eURoYCVepuq2SSuMKSaaWBuoAS4VuCEpAEui3g2c0/qdH8Xc+77h59TqSFEjv/YBy0Lgt 5t9uZs7JISEmMX6G2Y3hFeSiMa0ailDAZYuoJqKZx/NUss3Hhqr8Yu7z7eMnC4r4boVYlKARDcqv xgCSJLDahkaUcYA6W64AXTq5yRUhWpQbSx46qSbvF/VcXYOIVGsrun1jZKpoYJDEkZLqRYDFkXpL hc4K8pSVTAe8CsNgWhWA4HA4IiUkl5FK6Cds1jWEdGxhwPzz1wxkaFzkplmS4RNGQLHjwhBDBssz Ik0lQuhMOm4/H4azSw9BlESQQEGRHe3kjkU9fM8N4c4f2vIBJvcrgzTHcFYjr0e7Qoq3y5KxlkM0 O8xInqASkagRAKNCylkr1rFATgnmVYFI7dbeAOXnmZteeUzQEfefT2H1fX6zb4TTlaAzLkgMiSZA P50J04y6A6Cno6EzhRhMu5RQtbIZshawh4VhaWBkMTkQCYwOCxgiURxjC83HsDr54NKu0SJlB94p F80sjlWY20xvXu2Hghx84FLZ90QD4aXSWGM4isQYsZRH49RVmPPSIhHKTghlQ/jzatdV9KhuCshI GHJxV6Bo1BBBxtb8xVkKxCHuHpcOIrnUxEyrOwtJdPogBMyFUCJy9gm0CHEYsGUhZfFbi4j9pKE8 JbL3E95Kbqiu85HirfcI8hlr2aSXM8E2xMxElovMyxkMSJrkDJMZMKhEVoae+yyacdWXk5t1ffmu DAbM016qarLIgsJVrYcuHB3ceaJwaI9SIUrshUBfOrKJeHOmCHGNUxcEjCX3zNmbKZGsONg5RkVb y2FJogF5r4C345WuJ9rpvSeAssqwOBUWnTAM9ZBjbLImc3ojMNTqqvhmSeUoP1Z86DInQIEmjuEx ZWYbcMzphsRSxQxjHkaTYueOcu85RgdJhXpqIDTuiB0jGBq1cKC+kyGm0xI21PJLikQ3XvEKFN1I VI+KlMBw185bVlgUisMxjKcymOYoMK2KUiPYdPQtLkuggkxGcvxFZPQyQkZGSgulsnfNrrbrxx6E 92lyV4VLQireF79xUX3DCmaiDCmrwpEadfLxv3ccnz0MOUgyqq4t7cDLxBNQaX8K7XiFf8JvFnq6 +KcvXGAwmlLuj1KSwk6y5kjdQgPv+Idx8KQb1hxs86xJMkscGY750ffuelAcQNdGX9A06VreB/BE ecsALoiJLlAd2REtCjMM1qgTVAYY5QrReE2TB8G+I7ON83sAcK2QwE2cVC+YEc6Ewk0AU+YWUB81 n/g1olChBcZQzAYmQJLsQJ0ZP1/YC7I19xSJZjYLCNRYJOBKEoZDWYSEkjc8Ss977UXi7kFTzdFq uz5hobWBDnkZxBAcW1Y2BpUBJmgBAcwNRnH4ptFmomOb4Wg+Bo7j20o+Ahk57q/Lk9jMe05jZ76n VxQN8Rj7bkBix8f7lgegt1zxEuIaE9okQ/2+qCD0yQSf5HfsxYhJbt6Cw99S+W5B8kBvNXF8/NqN uQ9eUsPgdNX4GcwNp8uBmHLDSXHEn6zKfXs1EhvTJVHiMrjl8ibkdSFn2b0OMHUea5hjEiaigdH9 1QGQ4rHmOHpLKNGaoRogJgKz5Ga4wHY+lTcjLZFwlzbMjNchdIW2ZJEB3i63ptunZpUaKEURJkQi lI6TI0jkvVt5is8fM+aUJwoic24iddYZdtAQJ+06z5PEYZMYv2yzEBAecTLSaVBs5QzPiR4nX51k WVAYa2O9n6kWIpExIllDIRmehMUSdTl5tbZ8q38VQVYGgf7BeG82GeWZd3c5d5BIwR+UBBRoJdw9 4RW0dFPSdp0Lraqzg+8vufZbaiRJX2zpNwuWRuG4RVZUSJUtSlzpKrEPGUXSyY2cBceyE3OZBjq6 InUcO4lifiQORoKwmjaEF0FPoovIEvl+72vvuANlKTgDwkQUxgoLRuAiy7N9walsa1AVEGF1ypGh duyIi06juo4emVWeUtH7QM5ySzGNZLIpxB8onEzRVBMI1oJ4Mxo+s7wZCYI+Jhamt8tJjtSbUJFd tXP6Xfg67w8FKfRvpQUlzTngm0CZHjHJq0vihAVQU1kQZKxNl+YQtQseSsdUk+jj/Cg8DnQG6UF5 JU0DkRRSII1bye0zHmiQMF9VJAXqq7DpMthaMEgsL4BIhSKaJEDGDpLce+SKhnQFSAgKASokrKYo cthtq7SReEq5imVWFtKEbtvbMlcAbhwdkqAgoTKMd9652om9GNDKYKZpIcionk6XCDUEEA/EaFDh zjYKdWIMwyJoPSOKVKIwMvI8FAWcr7DCubcMU0DJMyXfl5NvJFy069WvOrBFlK8h/n1oDBZjmF+R /gGT9uVAXtehMkbXcyGWway8X7oDATom5QTK3jSuFOIQHJTQWoJzmO8irMGTIuPjEOgVJRZPVyOw 9CFmJ5YkD2nXkwLX9qjlYO86cO6CuImqsIJY3SJUi8zt6HU5FJGzj0DMTkp2Bz0GgqQaly16djo4 kpUzUeqxC/bv2oWmQaKKWUzCj0pNI6MyVNW9UUCMMCYUZcBhKRR22nXzXmwt1hTunzrOaUSwVKp4 FgorfegOOZGGJRuXWzMzV8BtcHHMOZTlkEGYVLp8xZKe1obNDu45hGKyxMVUAbxgPzYIDAjv+iul T+wTVE5kUI2zF2DJXMmS82q5VF5cJmSqO+rHjoPJJ6oq2QjMJcl1JMlCoNlIki44IvQKkY53TEt0 qhL4Okui7WI93q+ymvmmWAeiCShnwDbqMZpzN2CMX3kyoCy3/nvcf2OpzNkWj6YsMLYaTxPsnDEt xn0yET1kYGfsEZcikSoPiOuKTJVlltRMKRHpUylEW1sGA7cC36wgvijSKYyNH+LuSKcKEhnCWx+A