# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.skold@oracle.com-20110623102927-ipz6824a99a8kgb1 # target_branch: file:///home/marty/MySQL/mysql-5.5-telco-7.0/ # testament_sha1: d8276d98cd2c67aca2ea7325435cba53ba9d02a9 # timestamp: 2011-06-23 12:29:38 +0200 # source_branch: file:///home/marty/MySQL/mysql-5.1-telco-7.0/ # base_revision_id: martin.skold@oracle.com-20110622154141-\ # 3ve4zp1b1f7j17yx # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZgThjkAAYvfgEAQUGf//3YH nCC///9wUAObdnoHbwjggkqaNT0E0yjeiTynknpPUaDQHqDQaAiaZSPUwTyho00AAAaDEekZAkiC aDJDQTJptUnqaep6T1NBiMmTT1BlIh+ohoYQGgDIZNGjEYgAkpNJpkabSDBMpsmk00NGINAGh8u7 iN/X22G7Rw5W4VQcLmnCMHeqcjn6cWZl/fwD7RnA8+YJHE4RS5nRhLD2nrNnwUBOZ4I4orbLy0JF ALurUDQIrQqfOHJAC1U67UHnAiLrM3wSoENqZXvWCVIs+EEPmeLkxxDILoSICHPBXKCjJSh5ey76 GIUZOXpvC891wnMBHI39YiHg++ud77VVe8z+uGiypPkfVTX7zr0DsgaKHhijphEOTQVGtKgVWd+o Urg6joV51Z3aVxnEUHkeJ01xi9MTnoFjI21FRMdMnfGfhm2JMciLA3Fv9kr8u/N/yxWzv7Bkc62d 5l4o7ZdJGBczKAwm03qXqL2VqrHWPTE4ElnyFvzqWJbe3tcpJZGnhu3KMZ8ep1UV6xfHYLZSWS34 mRQic4YWphcb7y+BAV84MNiLKeRz7+thjETWg1hbYnlk+BWdGhWLSsi0Cc4JrmmUCk2++XD0H7/N sfPkoa/zqb5JFQP0JVAKBCj0JG1uVymvfT9J44dRmp0EpqZfjZKAgj9xMsXPAPha8cDdt2C2i58o w9XJGIc8Hhx8ise0RQZh0qNh0oWRjvFuVL8vHI8xrS7QG2rciVXEdxlMQkHWsNNt30UMgSMXJFPZ NY1i1ceGL6yeylOUgyJSpELYqNV5zjiP1ZVAktNho9+XWzHoV5JPY/WOY2QUxGY11UdWBMW0SE97 rXvgN8Lc0UDtjCszv2kKgWedqwvvtM39KRBCsGklK63MGpuZhrpkHcb77Kk8XHYNsFah4xHuWDqZ iK7WfBCN1AwkyhWtLLCXnuTH7hxlTSdgKcIscQ/i6VSQShIKcMNz9BOoKpiC4Tg1xCGTlR3BEMnF BN5grHXVVSHduWRmtPNzKo+Ij3txD5n0GfFbLoVOHa/8JzKNcSZIZaygj/ouEDpth6HjhZEWTKvJ jOXiCiCkHuiQ9Uj2hRfm62YUXctN7Moku1N0ZUJ2F21MUX8dEXJLWCMO2ZPXlsvVfLSdaZArglaN V0ptBv2EXLdma6tT4O5iYottZuxUHUNw2ROvKBnCOaa2UYChkCUGsWDJGYyqkobqlx8qs75sUZIr x4IjSphqzWsJbtyeFBOTqHemEH+LuSKcKEhMCcMcgA==