# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101208075831-\ # pcchhrs9dovzsu9l # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 13bf96e211a6f669182768b8f4dee79d8c4042d3 # timestamp: 2010-12-08 08:58:36 +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-20101207172702-\ # 10htessx2apylwp2 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZJ4JjIAAhxfgEAwUOP/93IQ yAC////wUASZPDdqrOxSm21TCSimajE00000GTKbFMnqYg0bUNASokelPZNMmVP0miY1AwTACZMg JFAKNTNJ6U8npGp6I/VGnqaD01DQPQwGgAAGgAAAAACSRNDQAmpmTIRqfpNGlNBoaM013mgd5g8Z ekDny/T6UNFobU7teNAmwMTcQreSjL7U2HkWG2Nr8+a2bJ11cKEjS4tObgdR9/C6Gln46eftoKaW o3sCejY/TrO8k1RH1vDEwRjuKq5a0TBghQN2wVjGGs+Q7bwPfDIVcjU6i3g89jErRKRgk1axqHmB 7rpF0d0RDMO+HVcAgyAgJY2o1pJKQZEqNAJRwDvUlRBSErojIpS6gVvftKhesjgqvNO+aJbt00s0 6FcG4pfu6+OGLw/lW/erIsJjILkRIPY4Zcs76yctJ7DJg2n4NbQjNAXBUhWDBdayNTWmZnLIZnjR FR3xR5dEMmX6GG4+MRk5cRrdlAsoNmcUOUPgWpyskMai8NpRoMK/ZC/KgbwZSAwUExweWrXexLpz sbSc3GFYc0UaTARH+npfGEFXHnic6lKZBFDCx5esmaRoFjrZGIiYUYGBWKYsh27VyMxnWlnVcjFA 5whirdIUkXW2g60wJhZ6Qrv1AfD3gVIlIgtg6pr01xe1YmBaKUTUzsYgSEbH72JqiouOpcOlI/gB 4/8gd3brzCd17D9LnhBa2KcQdXNWRWzyW/fbUNmg1ox5ndMSsPMNNv0h/JZf1+1Lq0lUEEo6Dd8q ClmmSDUM54k7ePESjrrLSgzuRx0GhyeZlRBeZUuAlQuEczLLTN2M4GSCGx4NfMDMm7HEccQ3ATR2 pLdMwMnMJeuQlH8JaGphmY3wMvYrxp4l4RBu8kqKiUgg/9xhxyWkqXMh9AsAZU/HpmgDGgacZY7f ak7FZQJTcMiblMiHiSWsxFNd2dk5DFYy7BpDYuyYGyd62WnhIgaYCceh+AfXQmPJx2uxNddFOq/+ NjwfkrNHnbUZ53vFV4Hk+Q2aFO4DZJdQPnyRcjQ6dOZL15oY7oOUwsRqvRFod3o0v8hyIEtyPGMh Sa+btt0D4I8j3PAlicjnZ6DnFiSzRz8x5nofREWOgQR5OR87FYlYJOCa021vCop+6IoX1uLs5Nk8 pPO8y76zmu11K+NKEBLcoxYjMZ40RUORPuKpUdE7wppE8wGK2LzKLNIVdB33YJQmpGBOmDb4Ek+C ZKMTl8iVaLFgez1vvSPY5yi1QxrewwcQJqVu8hdlXglwR4GoqHbJz4K4EcZoJcXn8etWlZZ/HCS/ YCUmYNAJbt4QrTmiYpQ5IefbAS9SgN/K4yMm3uNsvctuF7EYI7AOsio4I44ODtSPZOR+wSJqDgV4 zo0KS4GpznsKEuk1aLAlYIPA6GTDi3Y83hzS696FKZ5I/g9+2IE4y3oohxrRAiZbBqLp1nRzzLGo qNa2kMj4H+LuSKcKEhJPBMZA