# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mattias.jonsson@oracle.com-20100820100733-\ # uwp14yiuccu4n2nt # target_branch: file:///Users/mattiasj/mysql-bzr/b54747-5.5-bf/ # testament_sha1: ccc216f37bc235ba92fb4232f6c71bb46fda10af # timestamp: 2010-08-20 12:07:48 +0200 # source_branch: file:///Users/mattiasj/mysql-bzr/test-55-bugfixing/ # base_revision_id: joerg@mysql.com-20100817135418-6u81wjwo3zdujqfj # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUO+B5kAB+d/gEJwEAB8//// f///9P////5gER19qaZSthbUWgoAAYyrVJX2zrZjSbtwKHTSVrLTUkbYzhJIiJ5qaaNGU1T9olP9 ATTKmjeU1PUYGp6g9EZtJD1B6QHGhoGjTI00aZAYmCAAGgNAaZAYEyDjQ0DRpkaaNMgMTBAADQGg NMgMCZAkRE0E0mmTKemgTT1U/U2o9EJ4o8pmUDQyAHqHpMTQbUomkAyeptT1GmmIZGI0A0DQ00Gg 9QYCaNAJIgmgAgBNDQU8SYqfk1NMU9T1Hih4oyeo9TI8jTS7mGBc1+9kjJB/g4PxOzyHOzqOiH9H vn7GvmxIn4WEpnNGia7tyQdce9x7Yswy/e6S4LX9QZobbl8uBqyNM87vyvqOVdG6m1ZxqlulBmnC HoiHAo5ZswP8ywiViob3JdGXstSgYb4vtw8XDs34ZUtoakfNyxBCpoKG+YXXVKBxka68oSa6DgtW TmDIsZdjIPsrzPYD6Uuslr11nHC7O2bg+2195/q//nduWpcyA88xDNzQGDSD1jgS3lokaEbcGuKX prTBv830DA+2/9H1AWZb3n1lbkfyONPVVwhqvnWjxcWxeAtQmZmYZmZJmZgOrb8EHZ3c1uX21kPi pHf34mKoSWdXNzrizyyeV2pfH6qK5kXXSQ1R5WiXhMTfGLpEXPT+Ado/P6zt6ztO8qJnDdu5DQRE DxXhx6EQ/4NREs9np5CPZ4mv26JhiafL8jgrTypY58xebguLT9x/EyEYa9uo+fzMzafEOeAy5hzG zbC+XsUeQge4+cHTfDWBrmg8bV3vKOJZRUoplS/ac/e3VCcGYXtemF9MQ3DC7HM0sGoP0C7wM4w5 JllVnsjW0sdvzw1UP8WPeKOBWmC7ZBU1lZlO3EWkyx1RoyKF8RQslOo8hZkGij4i/qx9WlvNs07n tBPdG6/Cql1JGNGYrfft0ugUeq5ng72O7+JEih/e5z4p/xd5OG/nbpZ+r2HmqJ9a+sZiWEYt27pn yxOmLXOkfu3T8gUQfIMQQeDY22xt9IOF7me1mQ2F5xJS6vbCjRB4FVArMb7mZBqCQlsDXkUBn8cS pYYesDuPT1yd9cxzUleca8p0/T01bt2TWIjA+LzWdjTlSjmlzr8dT0GkfjTLaxnwaMODTGm87iEz F8wFT71OLa11AUrYJhkHQpUCgKJl0hv5CrlxX4I9TJRlm/f9RqMLCiPfEO9BgetZADLty/PnsjhQ I8X7ObHVdsaTTbYwzTQHDrgKDlCGRwDuR0mffzPhAVVe9xazYyL0zN6vtGNA0LEkdbOxpG5qeya0 uAldHjEzuCUwwGepSgQ0IVwoF/2xHRQZitZagVE1FFcSDqQQ0aGWTAKl5f5jAqkiReoIFFwr9CUs au02GJ311lpKFJ3i5i+Y4HjcG4g6HHdOMXWWTnLZsy5/zkEC7GFNAXDHzFWOnEKRyYwK/0FvkioF AhWT2U5FmPGyviRWJc5BMnI+WGR1ATcmDQPv0o4BMkFZ8ZaNMxIKzqc4RVSlDvzMSooLca8JjdZi w2gqYWGYmLD9hiJxkg2lS1PjbY3Fq4Yu7cMqhFmzCCIADJIps6G6griQNgQo152YE8B6FhHkUzqV pCWRkQhWX3ZJbip66nl1dCzOVgq+MkFxEaY+U4RkhlVK/5X6VoAJQ+i2vprvwmqMbOKLnAeYBdao APRn4dRsRUKsnNWUiU43l9DAgGgBC1MXTvTnUysZP1FDsKXlm6EoLLI7RuLkLikoQ663zIlRELDI YdY4ldygph1h9AUguteK2GG3LPU7u7BdZxCSzoVAY1VRJLOwqoQOkp3ImVKh0nEJO/IkW2SgceXE oSRoTXWrY01YjEzeZFmjUN3Ds8vAu1pWV8zAjL+wfULwTAFQBVnlqtt4dGhAn1qQvLA7mkTW02QX Aa6ZcYHcZELxRhYxORAbMOPPnKSabH+sWT9hwMAJmmlYVkTDUsdI6gurNBTLNrkSBr8szvTSwIw4 Be1g1bMxHtzuNWcx8ipWDwG73pUdcEKVNTgWQ9BxtxjA6Jy0iPkQS3J6YsbhbyojgwtC5Zk15RKz wCIBWtxE1ZFxBJlvqGcqwvkayMoYZFaJiZVdZnfdhUA5YSKiUDLguKde1b19a6jG0ybSj3RaTmvV LGKZMnOc4rJLQkWa1ZIAiMLUU7aq4xDryMe3E4F1dUb6zhmZ6Yoqr4OQNCsoORrYsrZ68RoVi7mK qCjQeYR7WK/iFkKYpijbCMTM0nljY+s100LimVpkYssKsRVPVDldHjTS7xRk75VSgoSoldLkCoEO sQBdeTaHggvq7vUex4DTe1ktzB7SDq0UKB7X/6Y6IG/BLrPcA152MefVvNLbbbZ5hUUjQMHj7BNv 2yfHKpEI5D1oXb7jxC+bA5Q7TiplUeILwEew8EM9K73AjijOQO96rUBMhmagJj3ARgciCR+iD0a0 FiS9jLkF89WtEko9iazBiNaU8g9cS4YT/EYSID5VshmGaUwoKY0EaCB2n2EWRglgIgsIlKwlIvuN W7VvfKZhBZEh+hAGC5AWpLmXBzNZUYuzOfnnRCNaTAjeGaLkVkVWGZoA6EFwjIqRbIIJA+9JgtQY molmNtXs/M7CsRWCNomuD/5BoEjMZHUPNUCgwZuDYBHEyKoQznCiKLQbTWjYNQ23BBHMlgWRcDIV TLNLAlXmw4CwRyCvN5WhFiVpwLxGAh81ge7Ef9BnAZlUOLYk4j8GSzQSkGpEQWxwctSxRIC9y9ER kqCNoPkBF+AIuChUGYCuDBKestgMTEc0AxtWoWH6lBGSWA4ZFZgXoOCWKPE+v4IU1SUmAYL1baTJ kzMo4u1giW+GUkdAjhQXF6UMvEwbBVLF8CKIpKGxQKKfXcFEB8BDTETUfvKj/lER1NW7n+xwZxH1 mBeB9owvuPrIE2s+4vVicYsgTrN3u/H7zGaZkBqGB9d474cqEXlE3oKhl7S+9Kct0PREUnadRKlb Qfolmv2NRv/6jsXqBNJBB6MAyXFMjHqjuYYSPXUEIYNAY35hCERe96IDnP4UB+RCkGXinnZCIzIW Uz/BWKfdXlMxIal32GEwFhJmkPnozjk8LaNNqT4GPOj3mYkMSWYZEfce+8YMqkAWxg6FJKGWSRCH BMkHzMl57V0ZA4isWhV46xvxNDhMM361/2ktXgAXu+C6KBvXnNuRt9A3pRMBUGTsOhG7QqwEJgrR +LHGAfTBJzDiydEATZ4IC5EAGpBsaU0IbGm0zVEtdjoMblwQb5gYIHNCfiLhrxp3THK05aFBlYB2 kS5lYBAjcTSVEskL4y43o55TUG9WsoIw6zmROlWhBYLuI5EvNwl+C14BTBZ46rKaUZq2ed84zM3Q iXNwmM4Tc1Ymq6boJ8kTuLSTV8WQ2wabYhdaInCoMREfFjIYNry5BWD/I7W0lp8cRYXCA8zExMKB DxLaBhzQFDKAzgULgowlC/3DsZLV1h4FPB7puGxaVCa6LogcZ6KRSltNaA/A3F9BlVu78lPLjxbk utlie8MnMSSLOON3Jslw//haGsC7bCK8GWp8ofESEUZBvXN0gxVffd2RSVAJHgu+GBI7PNvI5Sxs Wpu99YxlolmXidsW0CZJchMoeYwjqVeZ6VoT4XYKaWxuLr0h3oMSC5kDy5isWh3exdCxWFS9fgMS iQMUp44pdQVlFq7v1Fu4iYURe5exHIlFVoYn6eo8hQ4KiOmbjh3alCAm6JxG5danJFqVzQQtywss VxXjyO2eAeHRcrBQ5NgPiHSnwThZqPmJeY64XFQVlycBfKyOEfOCoDZQCfA1qaXnchdeA5stQdgp IBw7j4xzcunZASOT3HXz71sYAic1Dy6rM9EEUuSxSFgpkrWNK9yB7b6lZa6oH5NmwbY+PO2AF7IZ JhDNjULFW5oG9DwOU3jnOAei7IgH7wCBAYVFTKpXkWIRzKuRWLsWatZBcu9OYBmvLX1G5B5wVm2o 7GYNqFmGiZTQbaQXrmhUZCPG44hSzfcdy9PQBkMwGxCGiBA00zSCaOyNOZxNE61dlOe7qR8Nuwa2 QzDGd781WKxJbDHFUMO2fp0432hsYKIFG13XAPkPgkwn8fC9B0ilzOaghYhaJesMaUSoXhLSh3re tTO8cMg/IaMXoWiAhzoiZaj8YgbFtGB3gG9QJBIUVhrIXMkYY2QVSgbLM9zCSCXiiidlBIiBf8qk j6VJE6gGD6DmFuAX5IYkX+7URyEJQRAmJxRym0D4gNeoXlyV/Ukwi+waSUj1raZgtrUihgTka3/Y sSIzfBElfdYSX1NBs5Grm2gxHRDFRCGkQg82Doh+00Ih2nqRcfKrffAmgNg7DB6kI3IIxQ7L5E62 cNwbbW9226Yg4fVfWUVndPqAOKSv7QPa4mB2pH5fmmIhw3Mi/l5cUszpZtCmJlcPw31oEcBcXXLy tUZ1MgMIY7FoX2qvEgFuoDDBQWN6HLZzypWoRAJjEQhF7QcfQWRqRTAZaIHe4mBZoOG6u6DmdGux BZJcvvYq1M/XDZh3QlmiVXGB4YLAMonsDDS35rrjRGliCxDDMDoLmCYhAO8KRRjpUghkfOT4I9Lh 9d0lwRnKEV5XJiRJii7ort7EsaTqrsMWScZmyCoOEQN6HZRFKVEEyIn+jEzYXcuxcq8hI8hdGwd3 d3xDxIgHMqkpTKmRTKmG6RQ1pbRIZrHsaJesGnZBAeBFOKzuEaqD5h3/HlVs1BJwCye9TgOzlJ1C /e1QxPlSfG6c2NJODYCGt93dhQVQmoirFHoCxCUWVSFalchMyZiJ7gYIhpRlRVxGDCdzrkwLwIV+ PIwmQdCewTh9h5iYZdbniPSyxMjAHEbzBJHeEijmG5TCNgakNbDgCqAvuzEWZxcoLUT1lNJQvYGG YkfKucV5uX07mbiLAAkEI612K0A8r7VP3+77Q+cTiMySouK4ZyN4XAMbAlu4tGcQT/6bUEBN56cV Q5C3ruPWHUAVHAtMM0/0Ku+oROLyGKK49x7XFX8NwremOhdi4C0AGJRxS451Wn3t6sLpiKU5Jdhk RpH55h46DypWo0Js66hdYBBeWlIdwQjYshnIq06ZZpvBsIfzNtQJOEBKj7hfX7XdIl/i7kinChII d8DzIA==