# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bjorn.munch@oracle.com-20100830133948-x64s4c7mwzpzs929 # target_branch: file:///home/bm136801/my/mtr-tr/ # testament_sha1: 41c1760a6b1aa8ce7ba8284c19b15aa587a12565 # timestamp: 2010-08-30 15:39:56 +0200 # source_branch: file:///home/bm136801/my/mysql-trunk/ # base_revision_id: bjorn.munch@oracle.com-20100830124551-\ # okpynabb856pro71 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcLnqP8ABaHfgFQwfPf//3cm vCT////6YAqvu3nWlmjyL20XWo3r6Xu9VFSAFbs733OfaCSQgTKm2VPaCbJpoqfp6qfiNU8iYQeh qH6p6EPaoJUTBExpk0CptqT9U9PVPUyGgD1HqaAABpoJRE08kp6ZQA9Q0AGgAAAAAAJESZIaUNoa jJtE0Yjahsk0GgABo0A2qBKbSb0moZMNTQGgMQxMgyAA00AkiCATJoYRMlPMk001NqbUhoNNADR6 gRAohelzfVx0GJ+u60s0/gifymsoi/PxpxyQhFNCEOfTn5Qvx8zzK8mwbyizjcMYQnVjHhjMTf9d KFbxzPGUEi9kgn1O6tByeJEFXDnCJgWqgamTUbL+ztWwrV4yCWqCkYEyFsYGbnw/zvlsuLD7bLuj 3Oiiqm82IyEb35PrfWnIL8i4BNDY22DYDGGHUgN52uxzknQ3Mb77tG3vXUs27mD36k3TM1Y7rTBW FwO+2xOHC5NvcrctsqhYyHGLabZnddt34e3BO+9nY39YOae9dTR3LrblNXHtHFbJGDWMWjhgUtKl XM3Ha6rqAtFr8t9Dit5KY9OC6q8V9tkl2uh22FvHtdVkhWXyRaq+q2TYJ89LRZu3nTEW1wC++6OF cxLljTrmWLegGxS1AMpzwO0alAYiNgKLmhQHBm5Z1ebScXR4ZKmKIx49kqeiuIg2otNqBPxBaHbr Idrd5vXvXZOSsJkxDRMqWxH8r6+4MoeR84UgG04yhWsQpaoEQTpI9U4tOIo7Ji8xY7dl1KAd3EQY UWS+1iEmkofJ7wsQQQLOMqXkKEaWCIuIIQKpRTH6JEEyIWEw4lDDkIkRSLhyQxUuZszIkoBVaVyS IjAiVthTM2AQdUJyv/wXFc4BG02ragLWwodWtbRDXlabAoqbhFCX7aQifkxxM/0wwLXMlU115FiH 1D0WWkMBbxNGTV05DSymSBQBVNOYsoJwGdcVEjYRqHg8uGpsiJ6ooYaOJKWmK1DxFE2CLjNrrFER Ko7BNGttKOLqhsr6J604qEJRQpMgUA4EjO6xVJoSCkOA56EyZZcmsC45EAkqQyK+BWSU3Zq9Hdcx y+FKltIUUuxWbiTITXk2DEA4SNID9pcHWp44mNKhZtJy8yuaJ1tfLEWmyMsV5LQSk9tgIMLjxHI4 ToU3VFg16Re/jKmARN08Dq5vJymGl7kw2k0+BEhWgNZmhru4UIzM+FWWE88GPYQYpqpikCDWCMRd 4od3Izy3IEvrWj9RbQXkgCQQNet9SKQfJLvNxtNTmbDeAWU0XFJsi2pkAQKfQ5nIxNd3HKuA0nuD gQNe4kt+eMLbVWqyCGKrJDEZqKyrgzWqX7PxfNp4zIIjca1oUispsCy01N16nNzzw3rOgsH7NRMI IqnlbpQEhzdpyFicxSLVlyF5EvGRnY7YAF08NiTNOxS/E7YXcmhHNQHgWMybtMKcDm740lcDyJ2F tOMq1VihQag+1aA565g6tsuMRrMGm5bi8epI2Fegi2ZmTihZmZ3HQGIgMy45zmNnafXCMwldTMXF gBfa5W7ORVDBiMGJAcEZ23NarjguOhHHDuolK02lYXx0uL4DOXmdMSssrLIXPCFcYIW8spuKZeYB TCRNAfZAjSVysLAylN3fIoMjEjErMSReYjoZCK9lGWEGKaspVxdhIEwA6uiVkFbN3+v7scjbz9ue F3o3Xjhn9iTbpv28PGR2NY6JHjhkZhm4ipIJiIRAh4afmKOfoCMWAIwR+OtY9kbBpM/a0Frk1Wmg YflLmHkEtJtmmkPHSDxyhXbMSrysJeFZHX2Fbp9a0bmRoYk5i+TiiAUppiaW6ZQ852AqBpGLkLzn Meo8ZrgZx5DmMDpuDMtZm1ZfZjNsEqs9DXCVNT5HMui7GkAjCKSqxA44VIAZEr9pignpCxEnNR5x 2Rz8ZQKOBoTZnIug4uNDMScRyEnE7CeRQYgbPUZDWvcdyTCd/0vg/OaDOVlGL3CS8+uzD+DkemXp aFmGP8NHkAQKqDyjaA5964JZKF/E5H3D6eokS5tikGcVMhhIwxCFWyfF8xuDdaKy2txSYDF3baBQ Byv5nsS9BqULYKw7i0geZNWeTcuFdGZIu5K/hRaS4SF1vbqFw1J48cDCFeZjD1X3lhP2evoSOkWK GN1DTNCg+BMsJbtDMdz4i4C37bWVDJ4kRbEEPZZCxM4nVW8uOEA8DE4djTj7TNItDsqTI2kFUNK7 j3krMbW6fVz+i177UuKYDmc0BWneeHSNUWu72z2SKbjGn8w3hTPDowCcyCpbgY9+sHj0Dd3y+m+l C4HhZctrC4p6JVuaiPAhwksOp0rKCJTEy8rx6mJQY3Fb1KRmJJ5GbSoD2C3imFGZjCNVoMsdYxVD lxfUDpNzbnCukZkE0yo3LlfTx7G7hw4IgDDiT1fm15DGiv4RIVL2Jz4kDoeIdeq8ugCtOmZpw8Hk asGnuhRfcUS71oa/VyCU/msTlUi/vwEFoIrrig2SxmBzPTtzlFBavFdEH0f80etuhSKnxkeZUN+H YEfD7NOzlxzM28vF1Yhjl1n1QUfevlkpfQqLs9OK2V40o0CkKRTZa9TGQRXj8qBe5eCHFxYWPexu J4ZUujqmor/qwsUljtJqjlyyu+BnBAsBmMGqgMJjEQS6ueP+CU5JTX2ZQY99fwBGJ09gCP1YwoPy qTjDMl4cpG5jbBDghk8mjmOlkpGVgn3sCKBGi8F2IVQ+rqCDY7l1MNSgC5lNgIOoHzs9VmnBmDFP STISLFW/UQvIGsJGS3vW2vDqoPiDlpBFKDe9ZEI2wRVlQ2EmVAdt6Syw6sJgIpdwSYKuB1FbWtj8 +nNWxqDIuRXyorAN5hfgzUphpsQgKI5ZMJdQX43QUJZNohJeW5FIkwQPuOU8oFsou0crglJo1pXx rqZNKLCaxiEXrCx+Z6le4t2EKo1LiQXJSUch6XjAI7CsA4uARj057sJIMbQWbCbBhbhZ57UEBc9g HpBfiG9H7szMzMzS1/ikFhUkGgapgIxkqUDGOm8lcSLq129oqmYnIxxyRSiWeShy7LlEpgadBvul UWEpSQIsxdFQg0ElcQRHgK7uYJUBamsl3NgXoh44e84QmOCbib0QDZXqWHxL5lYyuUYIdsyYGqq7 Eiljeg4LA9ewud0pjtVfED5Gpv1LTYdl5Ot1S5eFoaDRPKoLE5FS2HjnBD9aNUcuvanUIC2Y3lCz BaZRxZw17FQoLpp7imWZBed7smc0h7Acb94kmSYXRFigDcrXUymJT+hIBaEbiExEYS+4uWNW50Uk Znz0KMD4kuxtXh5HExtSCkdYCzpOYXPVOYIRORsssKgBciAAmMBmB6tqPeHLx4L8Yf8XckU4UJDC 56j/