# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magnus.blaudd@oracle.com-20110523152950-\ # 29h135ufpu4hukh6 # target_branch: file:///data0/magnus/mysql/7.1/ # testament_sha1: ba12c7a5cfebe6dc97b3cb7c1add11cb1b54215d # timestamp: 2011-05-23 17:30:34 +0200 # source_branch: file:///data0/magnus/mysql/7.0/ # base_revision_id: magnus.blaudd@oracle.com-20110523145045-\ # fwygclz52gp16r8v # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaWy98AAAbLfgAAQWOf//38n 3kC////wUAR6vevOSx1vPe916dq3CUQk0aNpTyDTEnkxTQAAAaAAJSTTRTeJoNE1PITQBoAAAAAJ QhpNE01TxpppqNT1HpGg0AaaeoGm0mgJJJop+k9FPTU9QeoNHpNPKGgGgAAAJKJpNppMTJo0p4p5 M1T1MjxQ9NIxHpMxQYaVv2xX8SO+V/KU48uWBHRstE7OEgJbcoT59EYwr4wNfZRVUuPf0M8GJSK2 PBAyBv6dodApiK8bOsaVeZVQ5Wr7WQp1y/ShLDwhBX7VbyOnd1iXaLKOUp4rOprtvTnXHb27kZUa QcYTcH4Nq+VW4ZkGjvocxEBbyzCrc1/KZsmV5iMHCK0jaL3SV0wfs1SiwYcLqdyIT3tQWOkTJDaD FtQ5Sk3zK5I7DbQi7vjKhiDGS4/aYRO6OmJ0dy24CUGUYnOu5Mn09k7BKapkfl1MHsvL7Z5SEaFa jFQhAexkwpxigXi7WYlesVtzNEiQEnhMGOC2uKbbE8cjmrZArYBi/V1WY4O76czUQ1757Kqq4zJo qc2pmgRGgM53r4CYltFSdwislaAwn+SKG9MX3q/AtOQYJvXbhCYkSJTmIZaM9+0PSax4KHZHzjUp irTSaapHUKTBrdE8R9Vc14ukdK+gsNlJ7hw0bMI9YoukgVmYunFElmha1a12K6gs90C14ItSuOE6 l84XHE3FY6GLPW1gx4y7xeHmeRpeIcG/wDlTMDBvBepEeweR06P6kYRCvHQ85aE02c+Q4vVQBxSE C8SBUEhUVdfyDx8osJTP1HGfRjS5Lx4ON4ZwZ3DgbOGfshBLywSOkamVwU0pEpoqU82tomiiBFpq xHhWSu11cWdpJxcVlMTTgS2kjxfoQ9L75KDSHeT35q6pxw45IuTWqqIflLkQpA69xQ+3OUWv6cb6 oGU3TW6MiHJlEPAcJFMIUpuS52T6xvjkh7x2l9qqr0tL3Twa2oJlwu8n1pRO66q3elK4JVZI8MRN LMXx13wq1TM+yPUt9khYEEcikyLjGrXz3BnedrgrlcjG6LTArLSSuW28aChFMj7tsomRUlpDy7KL IOzKaz1V2ZGTMOSJFn1GJdgvQTewHkxRaTkp6t2CyA2Qu92p6ZZDF/Ex+ixKDUjioO6cNiE1wkmH bbpwY6QhMkgZbNmB/9xWGYVoZP8QMwQCDQcjGkbGQSGNGBah9l9s5DMxqJaIXvaGCfs7hWSSSeFx fC02I7mIjkbixqFINGmoYNfHAiCGMd9RyJImgTMbwMAomKsQ1aMZPmajbaNLFhvhgXcaNeUFQj4P H9qRSF9OhEsU+orlPazJ5LuapO6WoqKRXxSn27VyrGD0jGwZZn9HTbSSGfovI5aZmVqQzSv2VOqg rerCcSoQX3w4YZ+DzStSaeIGnN1uC9qDOiIwUCiFwOdYRBti4hcOCDekqJqqapRYLpHQKSxxtL6h JOwWIoRbPNkhG4Vl6QR8RXFwmRmC82mYRAl53GZ5rIxki0vtCBrtDrlkSZiX0GhhQwW1LjdfChKF EKOnpNkcX+LuSKcKEhS2XvgA